From: Enlightenment S. <no-...@en...> - 2011-07-26 14:21:30
|
Log: E: Composite module: Only allow OpenGL engine if "ECORE_X_NO_XLIB" is not around (hence ecore_x was started to allow Opengl to run). Author: devilhorns Date: 2011-07-26 07:21:23 -0700 (Tue, 26 Jul 2011) New Revision: 61764 Trac: http://trac.enlightenment.org/e/changeset/61764 Modified: trunk/e/src/modules/comp/e_mod_config.c Modified: trunk/e/src/modules/comp/e_mod_config.c =================================================================== --- trunk/e/src/modules/comp/e_mod_config.c 2011-07-26 14:11:28 UTC (rev 61763) +++ trunk/e/src/modules/comp/e_mod_config.c 2011-07-26 14:21:23 UTC (rev 61764) @@ -1205,18 +1205,21 @@ rg = e_widget_radio_group_new(&(cfdata->engine)); ob = e_widget_radio_add(evas, _("Software"), E_EVAS_ENGINE_SOFTWARE_X11, rg); e_widget_list_object_append(ol, ob, 1, 1, 0.5); - if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_X11)) + if (!getenv("ECORE_X_NO_XLIB")) { - ob = e_widget_radio_add(evas, _("OpenGL"), E_EVAS_ENGINE_GL_X11, rg); - e_widget_list_object_append(ol, ob, 1, 1, 0.5); + if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_X11)) + { + ob = e_widget_radio_add(evas, _("OpenGL"), E_EVAS_ENGINE_GL_X11, rg); + e_widget_list_object_append(ol, ob, 1, 1, 0.5); - of = e_widget_framelist_add(evas, _("OpenGL options"), 0); - e_widget_framelist_content_align_set(of, 0.5, 0.0); - ob = e_widget_check_add(evas, _("Texture from pixmap"), &(cfdata->texture_from_pixmap)); - e_widget_framelist_object_append(of, ob); - ob = e_widget_check_add(evas, _("Indirect OpenGL"), &(cfdata->indirect)); - e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(ol, of, 1, 1, 0.5); + of = e_widget_framelist_add(evas, _("OpenGL options"), 0); + e_widget_framelist_content_align_set(of, 0.5, 0.0); + ob = e_widget_check_add(evas, _("Texture from pixmap"), &(cfdata->texture_from_pixmap)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Indirect OpenGL"), &(cfdata->indirect)); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(ol, of, 1, 1, 0.5); + } } e_widget_toolbook_page_append(otb, NULL, _("Engine"), ol, 0, 0, 0, 0, 0.5, 0.0); |