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

use randr for screen setup in wl-x11 output module 

enabling this module requires that e is linked against ecore-x to
allow screen management
This commit is contained in:
Mike Blumenkrantz 2015-04-22 18:18:39 -04:00
parent 89ae59b407
commit 15540c01e4
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/Makefile.mk
View File

@ -363,6 +363,11 @@ src/bin/e_comp_x.c \
src/bin/e_comp_x_randr.c \
src/bin/e_alert.c \
src/bin/e_xsettings.c
else
if USE_MODULE_WL_X11
enlightenment_src += \
src/bin/e_comp_x_randr.c
endif
endif
if HAVE_WAYLAND

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

@ -65,7 +65,6 @@ _cb_keymap_changed(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
EAPI void *
e_modapi_init(E_Module *m)
{
E_Screen *screen;
int w = 0, h = 0;
printf("LOAD WL_X11 MODULE\n");
@ -81,19 +80,9 @@ e_modapi_init(E_Module *m)
ecore_evas_screen_geometry_get(e_comp->ee, NULL, NULL, &w, &h);
if (!e_xinerama_fake_screens_exist())
{
screen = E_NEW(E_Screen, 1);
screen->escreen = screen->screen = 0;
screen->x = 0;
screen->y = 0;
screen->w = w;
screen->h = h;
e_xinerama_screens_set(eina_list_append(NULL, screen));
}
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;