discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=15540c01e41a9a2dc3d8caad9943fa4979f43248

commit 15540c01e41a9a2dc3d8caad9943fa4979f43248
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Wed Apr 22 18:18:39 2015 -0400

    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
---
 src/bin/Makefile.mk             |  5 +++++
 src/modules/wl_x11/e_mod_main.c | 13 +------------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 8fe0706..3917170 100644
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -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
diff --git a/src/modules/wl_x11/e_mod_main.c b/src/modules/wl_x11/e_mod_main.c
index 2d298b1..7c1434b 100644
--- a/src/modules/wl_x11/e_mod_main.c
+++ b/src/modules/wl_x11/e_mod_main.c
@@ -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;

-- 


Reply via email to