[EGIT] [core/enlightenment] master 02/03: set x11 randr iface for wl_x11 based on wm presence, not composited state

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

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

commit c6ef590e9e726b2c83e918c3411c3ec9ecfdc3dc
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Tue Jul 12 12:49:03 2016 -0400

    set x11 randr iface for wl_x11 based on wm presence, not composited state
    
    fixes usage in non-composited x11 environments (eg. openbox)
---
 src/modules/wl_x11/e_mod_main.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/modules/wl_x11/e_mod_main.c b/src/modules/wl_x11/e_mod_main.c
index 5f8ee71..a0332e0 100644
--- a/src/modules/wl_x11/e_mod_main.c
+++ b/src/modules/wl_x11/e_mod_main.c
@@ -15,6 +15,8 @@ E_API void *
 e_modapi_init(E_Module *m)
 {
    int w = 0, h = 0;
+   Ecore_X_Window root, win;
+   Eina_Bool managed;
 
    printf("LOAD WL_X11 MODULE\n");
 
@@ -23,6 +25,9 @@ e_modapi_init(E_Module *m)
         fprintf(stderr, "X11 connect failed!\n");
         return NULL;
      }
+   root = ecore_x_window_root_first_get();
+   managed = !!ecore_x_window_prop_window_get(root, 
ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK,
+                                      &win, 1);
    e_comp_x_randr_canvas_new(ecore_x_window_root_first_get(), 1, 1);
 
    if (!e_comp->ee)
@@ -35,7 +40,7 @@ e_modapi_init(E_Module *m)
    ecore_evas_name_class_set(e_comp->ee, "E", "compositor");
 
    ecore_evas_screen_geometry_get(e_comp->ee, NULL, NULL, &w, &h);
-   if (!ecore_x_screen_is_composited(0))
+   if (!managed)
      e_comp_x_randr_screen_iface_set();
    if (!e_comp_wl_init()) return NULL;
    if (!e_comp_canvas_init(w, h)) return NULL;

--