From 9f45e76c20ab4a052e29e245c382db115cc28f89 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Wed, 29 Oct 2008 19:31:05 +0000 Subject: [PATCH] Export driver as engine_name. Also make sure it matches the names used by engines_get(). SVN revision: 37314 --- legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h | 1 + legacy/ecore/src/lib/ecore_evas/ecore_evas.c | 14 ++++++++++++++ legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c | 10 ++++++++-- legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c | 2 +- legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c | 10 +++++----- 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h b/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h index e0a9e68f2f..2e2b276f9b 100644 --- a/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h +++ b/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h @@ -229,6 +229,7 @@ EAPI Ecore_Evas *ecore_evas_software_wince_ddraw_new(Ecore_WinCE_Window *par EAPI Ecore_WinCE_Window *ecore_evas_software_wince_window_get(Ecore_Evas *ee); /* generic manipulation calls */ +EAPI const char *ecore_evas_engine_name_get(const Ecore_Evas *ee); EAPI Ecore_Evas *ecore_evas_ecore_evas_get(Evas *e); EAPI void ecore_evas_free(Ecore_Evas *ee); EAPI void *ecore_evas_data_get(Ecore_Evas *ee, const char *key); diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c index e08907de12..03f9a9454c 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c @@ -610,6 +610,20 @@ ecore_evas_new(const char *engine_name, int x, int y, int w, int h, const char * return NULL; } +/** + * Get the engine name used by this engine. + * + * should return one of the values in ecore_evas_engines_get(), usually + * acceptable by ecore_evas_new(). + */ +EAPI const char * +ecore_evas_engine_name_get(const Ecore_Evas *ee) +{ + if (!ee) + return NULL; + return ee->driver; +} + /** * Return the Ecore_Evas for this Evas * diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c index bc0af15ba1..e7b97a3ec4 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c @@ -522,12 +522,15 @@ EAPI Ecore_Evas* ecore_evas_sdl_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha) { #ifdef BUILD_ECORE_EVAS_SDL + Ecore_Evas *ee; int rmethod; rmethod = evas_render_method_lookup("software_sdl"); if (!rmethod) return NULL; - return _ecore_evas_internal_sdl_new(rmethod, name, w, h, fullscreen, hwsurface, noframe, alpha); + ee = _ecore_evas_internal_sdl_new(rmethod, name, w, h, fullscreen, hwsurface, noframe, alpha); + ee->driver = "sdl"; + return ee; #else fprintf(stderr, "OUTCH !\n"); return NULL; @@ -538,12 +541,15 @@ EAPI Ecore_Evas* ecore_evas_sdl16_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha) { #ifdef BUILD_ECORE_EVAS_SDL + Ecore_Evas *ee; int rmethod; rmethod = evas_render_method_lookup("software_16_sdl"); if (!rmethod) return NULL; - return _ecore_evas_internal_sdl_new(rmethod, name, w, h, fullscreen, hwsurface, noframe, alpha); + ee = _ecore_evas_internal_sdl_new(rmethod, name, w, h, fullscreen, hwsurface, noframe, alpha); + ee->driver = "software_16_sdl"; + return ee; #else fprintf(stderr, "OUTCH !\n"); return NULL; diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c index 4fb3e62765..3406d95142 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c @@ -1059,7 +1059,7 @@ _ecore_evas_engine_opengl_glew_init(Ecore_Evas *ee) if (!rmethod) return 0; - ee->driver = driver; + ee->driver = "opengl_glew"; evas_output_method_set(ee->evas, rmethod); einfo = (Evas_Engine_Info_GL_Glew *)evas_engine_info_get(ee->evas); diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c index fbfef9de91..3a3a987f8f 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c @@ -1586,7 +1586,7 @@ static void _ecore_evas_x_rotation_set(Ecore_Evas *ee, int rotation) { if (ee->rotation == rotation) return; - if (!strcmp(ee->driver, "gl_x11")) return; + if (!strcmp(ee->driver, "opengl_x11")) return; if (!strcmp(ee->driver, "xrender_x11")) return; if (!strcmp(ee->driver, "software_x11") || !strcmp(ee->driver, "software_xcb")) { @@ -1625,7 +1625,7 @@ _ecore_evas_x_shaped_set(Ecore_Evas *ee, int shaped) { if (((ee->shaped) && (shaped)) || ((!ee->shaped) && (!shaped))) return; - if (!strcmp(ee->driver, "gl_x11")) return; + if (!strcmp(ee->driver, "opengl_x11")) return; if (!strcmp(ee->driver, "software_x11") || !strcmp(ee->driver, "software_xcb")) { #if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_XCB) @@ -2350,7 +2350,7 @@ _ecore_evas_x_reinit_win(Ecore_Evas *ee) } #endif } - else if (!strcmp(ee->driver, "gl_x11")) + else if (!strcmp(ee->driver, "opengl_x11")) { #ifdef BUILD_ECORE_EVAS_OPENGL_X11 Evas_Engine_Info_GL_X11 *einfo; @@ -2398,7 +2398,7 @@ static void _ecore_evas_x_avoid_damage_set(Ecore_Evas *ee, int on) { if (ee->prop.avoid_damage == on) return; - if (!strcmp(ee->driver, "gl_x11")) return; + if (!strcmp(ee->driver, "opengl_x11")) return; if (!strcmp(ee->driver, "xrender_x11")) return; if ((!strcmp(ee->driver, "software_x11")) || (!strcmp(ee->driver, "software_xcb"))) @@ -2968,7 +2968,7 @@ ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent, ee->engine.func = (Ecore_Evas_Engine_Func *)&_ecore_x_engine_func; - ee->driver = "gl_x11"; + ee->driver = "opengl_x11"; if (disp_name) ee->name = strdup(disp_name); if (w < 1) w = 1;