From 998631103526e49aa86cc5da09f6b9f2a571439e Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 20 Mar 2015 15:08:28 -0400 Subject: [PATCH] move E_Comp->root window setting into e_comp_wl_init() for wl compositors --- src/bin/e_comp_wl.c | 2 ++ src/modules/wl_drm/e_mod_main.c | 1 - src/modules/wl_fb/e_mod_main.c | 1 - src/modules/wl_x11/e_mod_main.c | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index a69e759..b50dde3 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -2541,6 +2541,8 @@ disp_err: EAPI Eina_Bool e_comp_wl_init(void) { + if (e_comp->comp_type == E_PIXMAP_TYPE_WL) + e_comp->root = ecore_evas_window_get(e_comp->ee); /* set gl available if we have ecore_evas support */ if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_EGL) || ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_DRM)) diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c index b68a0e7..d124f87 100644 --- a/src/modules/wl_drm/e_mod_main.c +++ b/src/modules/wl_drm/e_mod_main.c @@ -133,7 +133,6 @@ e_modapi_init(E_Module *m) e_xinerama_screens_set(eina_list_append(NULL, screen)); } - comp->root = ecore_evas_window_get(comp->ee); if (!e_comp_canvas_init(w, h)) return NULL; e_comp_canvas_fake_layers_init(); diff --git a/src/modules/wl_fb/e_mod_main.c b/src/modules/wl_fb/e_mod_main.c index 5d8b76fb..610487d 100644 --- a/src/modules/wl_fb/e_mod_main.c +++ b/src/modules/wl_fb/e_mod_main.c @@ -42,7 +42,6 @@ e_modapi_init(E_Module *m) screen->h = h; e_xinerama_screens_set(eina_list_append(NULL, screen)); } - comp->root = ecore_evas_window_get(comp->ee); e_comp_canvas_init(w, h); e_comp_wl_init(); e_comp_canvas_fake_layers_init(); diff --git a/src/modules/wl_x11/e_mod_main.c b/src/modules/wl_x11/e_mod_main.c index 65f41f6..ada596d 100644 --- a/src/modules/wl_x11/e_mod_main.c +++ b/src/modules/wl_x11/e_mod_main.c @@ -101,7 +101,6 @@ e_modapi_init(E_Module *m) e_xinerama_screens_set(eina_list_append(NULL, screen)); } - comp->root = ecore_evas_window_get(comp->ee); if (!e_comp_canvas_init(w, h)) return NULL; e_comp_canvas_fake_layers_init(); -- 2.7.4