From 7db88370f19bb419568309dba07563707ae7fd80 Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Tue, 24 Mar 2009 07:50:17 +0000
Subject: [PATCH]  * use the enum to set the backend in software X11 engines  *
 update to the new merged xrender engine

SVN revision: 39666
---
 src/bin/engine_software_x11.c |  2 +-
 src/bin/engine_software_xcb.c |  2 +-
 src/bin/engine_xrender_x11.c  |  4 +++-
 src/bin/engine_xrender_xcb.c  | 11 ++++++-----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/bin/engine_software_x11.c b/src/bin/engine_software_x11.c
index 16324ee..30f0bf3 100644
--- a/src/bin/engine_software_x11.c
+++ b/src/bin/engine_software_x11.c
@@ -38,7 +38,7 @@ engine_software_x11_args(int argc, char **argv)
 	return 0;
      }
 
-   einfo->info.backend = 0;
+   einfo->info.backend = EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB;
    einfo->info.connection = disp;
    einfo->info.screen = NULL;
    einfo->info.visual = einfo->func.best_visual_get(0, disp, DefaultScreen(disp));
diff --git a/src/bin/engine_software_xcb.c b/src/bin/engine_software_xcb.c
index c7388ae..da8fc1d 100644
--- a/src/bin/engine_software_xcb.c
+++ b/src/bin/engine_software_xcb.c
@@ -94,7 +94,7 @@ engine_software_xcb_args(int argc, char **argv)
 	return 0;
      }
 
-   einfo->info.backend = 1;
+   einfo->info.backend = EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XCB;
    einfo->info.connection = conn;
    einfo->info.screen = screen;
    einfo->info.visual = einfo->func.best_visual_get(1, conn, s);
diff --git a/src/bin/engine_xrender_x11.c b/src/bin/engine_xrender_x11.c
index 11dd3b6..cf85c87 100644
--- a/src/bin/engine_xrender_x11.c
+++ b/src/bin/engine_xrender_x11.c
@@ -38,7 +38,9 @@ engine_xrender_x11_args(int argc, char **argv)
 	return 0;
      }
 
-   einfo->info.display = disp;
+   einfo->info.backend = EVAS_ENGINE_INFO_XRENDER_BACKEND_XLIB;
+   einfo->info.connection = disp;
+   einfo->info.screen = NULL;
    einfo->info.visual = DefaultVisual(disp, DefaultScreen(disp));
    attr.backing_store = NotUseful;
    attr.border_pixel = 0;
diff --git a/src/bin/engine_xrender_xcb.c b/src/bin/engine_xrender_xcb.c
index 6733d30..1155bf8 100644
--- a/src/bin/engine_xrender_xcb.c
+++ b/src/bin/engine_xrender_xcb.c
@@ -2,7 +2,7 @@
 
 #include <xcb/xcb.h>
 #include <xcb/xcb_keysyms.h>
-#include <Evas_Engine_XRender_Xcb.h>
+#include <Evas_Engine_XRender_X11.h>
 
 #define XK_MISCELLANY
 #include <X11/keysymdef.h>
@@ -62,7 +62,7 @@ engine_xrender_xcb_args(int argc, char **argv)
    struct xcb_size_hints_t        hints;
    uint32_t                       value_list[6];
    xcb_screen_iterator_t          iter;
-   Evas_Engine_Info_XRender_Xcb  *einfo;
+   Evas_Engine_Info_XRender_X11  *einfo;
    xcb_intern_atom_reply_t       *reply;
    char                          *str;
    xcb_intern_atom_cookie_t       cookie1;
@@ -105,15 +105,16 @@ engine_xrender_xcb_args(int argc, char **argv)
           break;
        }
 
-   evas_output_method_set(evas, evas_render_method_lookup("xrender_xcb"));
-   einfo = (Evas_Engine_Info_XRender_Xcb *)evas_engine_info_get(evas);
+   evas_output_method_set(evas, evas_render_method_lookup("xrender_x11"));
+   einfo = (Evas_Engine_Info_XRender_X11 *)evas_engine_info_get(evas);
    if (!einfo)
      {
 	printf("Evas does not support the XRender XCB Engine\n");
 	return 0;
      }
 
-   einfo->info.conn = conn;
+   einfo->info.backend = EVAS_ENGINE_INFO_XRENDER_BACKEND_XCB;
+   einfo->info.connection = conn;
    einfo->info.screen = screen;
    einfo->info.visual = _engine_xrender_visual_get(conn, screen);