styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move canvas init after wl init in output modules 

ensure that randr screens have been created
This commit is contained in:
Mike Blumenkrantz 2015-04-22 19:27:36 -04:00
parent a452baafca
commit 1eb6bb20b3
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);

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

@ -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);

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

@ -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);