From a70e936be10000dd03c9267f7bb489fecf5ea378 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 11 Sep 2013 14:32:22 +0100 Subject: [PATCH] add E_WL_FORCE environment variable to force loading of an output module during init variable takes the name of the output module s/wl_// ; example: E_WL_FORCE=x11 this module allows easy loading of a wayland output module to override any detection which may occur by force-loading the module during startup in a later commit, an actual output detection mechanism needs to be added to run through all the possible output modes --- src/bin/e_comp.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index c494372f8..6d0be4267 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -1087,16 +1087,29 @@ e_comp_init(void) actions = eina_list_append(actions, act); } + +#ifdef HAVE_WAYLAND_CLIENTS + { + const char *eng; + + eng = getenv("E_WL_FORCE"); + if (eng) + { + char buf[128]; + + snprintf(buf, sizeof(buf), "wl_%s", eng); + if (e_module_enable(e_module_new(buf))) + return EINA_TRUE; + } + } +#endif #ifndef WAYLAND_ONLY if (!e_comp_x_init()) return EINA_FALSE; #endif #ifdef HAVE_WAYLAND_CLIENTS - if (!e_comp_wl_init()) - { - EINA_LOG_ERR("Failed to initialize Wayland Client Support !!"); - return EINA_FALSE; - } + e_comp_wl_init(); #endif + return EINA_TRUE; }