Enlightenment CVS committal
Author : xcomputerman
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/client
Modified Files:
main.c
Log Message:
Michel's patch, or what's left of it :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/main.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- main.c 4 Jan 2005 23:44:44 -0000 1.69
+++ main.c 10 Mar 2005 05:17:12 -0000 1.70
@@ -767,17 +767,27 @@
/* testing mode decides entrance window size * * Use rendering engine
specified in config. On systems with * hardware acceleration, GL
should improve performance appreciably */
- if (!session->config->engine)
- e = ecore_evas_software_x11_new(NULL, 0, 0, 0, g_x, g_y);
-#ifdef HAVE_ECORE_GL_X11
- else if (session->config->engine)
- e = ecore_evas_gl_x11_new(NULL, 0, 0, 0, g_x, g_y);
-#endif
- else
- {
- fprintf(stderr,
- "Warning: Invalid Evas engine specified in config. Defaulting
to software engine.\n");
- e = ecore_evas_software_x11_new(NULL, 0, 0, 0, g_x, g_y);
+ switch (session->config->engine) {
+ case 1:
+ if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_GL_X11)) {
+ e = ecore_evas_gl_x11_new(NULL, 0, 0, 0, g_x, g_y);
+ break;
+ }
+ fprintf(stderr, "Warning: Evas GL engine: engine not supported.
Defaulting to software engine.\n");
+
+ case 0:
+ e = ecore_evas_software_x11_new(NULL, 0, 0, 0, g_x, g_y);
+ break;
+
+ default:
+ fprintf(stderr, "Warning: Invalid Evas engine specified in config.
Defaulting to software engine.\n");
+ e = ecore_evas_software_x11_new(NULL, 0, 0, 0, g_x, g_y);
+ break;
+ }
+
+ if (!e) {
+ fprintf(stderr, "Critical error: No Evas engine available.
Exiting.\n");
+ return (-1);
}
ew = ecore_evas_software_x11_window_get(e);
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
