enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

fix issue where wayland modules were always creating a new compositor 

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2015-01-06 13:04:04 -05:00
parent f2e7bd7204
commit a8b4717fdf
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/wl_drm/e_mod_main.c
View File

@ -67,8 +67,11 @@ e_modapi_init(E_Module *m)
/* return NULL; */
/* } */
comp = e_comp_new();
comp->comp_type = E_PIXMAP_TYPE_WL;
if (!(comp = e_comp))
{
comp = e_comp_new();
comp->comp_type = E_PIXMAP_TYPE_WL;
}
if ((e_comp_gl_get()) &&
(e_comp_config_get()->engine == E_COMP_ENGINE_GL))

10
src/modules/wl_fb/e_mod_main.c
View File

@ -23,9 +23,15 @@ e_modapi_init(E_Module *m)
ecore_fb_size_get(&w, &h);
ee = ecore_evas_fb_new(NULL, 0, w, h);
comp = e_comp_new();
comp->comp_type = E_PIXMAP_TYPE_WL;
if (!(comp = e_comp))
{
comp = e_comp_new();
comp->comp_type = E_PIXMAP_TYPE_WL;
}
comp->ee = ee;
if (!e_xinerama_fake_screens_exist())
{
screen = E_NEW(E_Screen, 1);

9
src/modules/wl_x11/e_mod_main.c
View File

@ -77,9 +77,14 @@ e_modapi_init(E_Module *m)
ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, SCREEN_W, SCREEN_H);
ecore_evas_callback_delete_request_set(ee, _cb_delete_request);
comp = e_comp_new();
comp->comp_type = E_PIXMAP_TYPE_WL;
if (!(comp = e_comp))
{
comp = e_comp_new();
comp->comp_type = E_PIXMAP_TYPE_WL;
}
comp->ee = ee;
if (!e_xinerama_fake_screens_exist())
{
screen = E_NEW(E_Screen, 1);