From 1eb6bb20b343a0e78a7e992cf6396b2cc4c27398 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 22 Apr 2015 19:27:36 -0400 Subject: [PATCH] move canvas init after wl init in output modules ensure that randr screens have been created --- src/modules/wl_drm/e_mod_main.c | 4 +--- src/modules/wl_fb/e_mod_main.c | 2 +- src/modules/wl_x11/e_mod_main.c | 5 +---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c index 3547882bf..809633171 100644 --- a/src/modules/wl_drm/e_mod_main.c +++ b/src/modules/wl_drm/e_mod_main.c @@ -143,10 +143,8 @@ e_modapi_init(E_Module *m) e_xinerama_screens_set(eina_list_append(NULL, screen)); } - if (!e_comp_canvas_init(w, h)) return NULL; - - /* NB: This needs to be called AFTER the comp canvas has been setup */ if (!e_comp_wl_init()) return NULL; + if (!e_comp_canvas_init(w, h)) return NULL; ecore_evas_pointer_xy_get(e_comp->ee, &e_comp->wl_comp_data->ptr.x, &e_comp->wl_comp_data->ptr.y); diff --git a/src/modules/wl_fb/e_mod_main.c b/src/modules/wl_fb/e_mod_main.c index 406dbe19d..c64db83b6 100644 --- a/src/modules/wl_fb/e_mod_main.c +++ b/src/modules/wl_fb/e_mod_main.c @@ -35,8 +35,8 @@ e_modapi_init(E_Module *m) screen->h = h; e_xinerama_screens_set(eina_list_append(NULL, screen)); } - e_comp_canvas_init(w, h); e_comp_wl_init(); + e_comp_canvas_init(w, h); e_comp->pointer = e_pointer_canvas_new(e_comp->ee, EINA_TRUE); ecore_wl_init(NULL); diff --git a/src/modules/wl_x11/e_mod_main.c b/src/modules/wl_x11/e_mod_main.c index 7c1434bd6..78da2531c 100644 --- a/src/modules/wl_x11/e_mod_main.c +++ b/src/modules/wl_x11/e_mod_main.c @@ -80,12 +80,9 @@ e_modapi_init(E_Module *m) ecore_evas_screen_geometry_get(e_comp->ee, NULL, NULL, &w, &h); - if (!e_comp_canvas_init(w, h)) return NULL; - e_comp_x_randr_screen_iface_set(); - /* NB: This needs to be called AFTER comp_canvas has been setup as it - * makes reference to the e_comp->evas */ if (!e_comp_wl_init()) return NULL; + if (!e_comp_canvas_init(w, h)) return NULL; e_comp_wl_input_pointer_enabled_set(e_comp->wl_comp_data, EINA_TRUE); e_comp_wl_input_keyboard_enabled_set(e_comp->wl_comp_data, EINA_TRUE);