[EGIT] [core/enlightenment] master 02/05: Track wayland outputs for zones

[Derek Foreman]

derekf pushed a commit to branch master.

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

commit 3ff5e8dff484c939227c158b2ef2975e4fc68264
Author: Derek Foreman <der...@osg.samsung.com>
Date:   Mon Jun 20 13:43:05 2016 -0500

    Track wayland outputs for zones
---
 src/bin/e_comp_wl.c | 5 +++++
 src/bin/e_zone.h    | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 819a26d..7032ff7 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2900,11 +2900,14 @@ e_comp_wl_output_init(const char *id, const char *make, 
const char *model,
    E_Comp_Wl_Output *output;
    Eina_List *l2;
    struct wl_resource *resource;
+   E_Zone *zone;
 
    /* retrieve named output; or create it if it doesn't exist */
    output = _e_comp_wl_output_get(e_comp_wl->outputs, id);
    if (!output)
      {
+        zone = e_zone_for_id_get(id);
+        if (!zone) return EINA_FALSE;
         if (!(output = E_NEW(E_Comp_Wl_Output, 1))) return EINA_FALSE;
 
         if (id) output->id = eina_stringshare_add(id);
@@ -2919,6 +2922,8 @@ e_comp_wl_output_init(const char *id, const char *make, 
const char *model,
 
         output->resources = NULL;
         output->scale = e_scale;
+
+        zone->output = output;
      }
 
    /* update the output details */
diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h
index 1741659..25d98f3 100644
--- a/src/bin/e_zone.h
+++ b/src/bin/e_zone.h
@@ -87,6 +87,8 @@ struct _E_Zone
 
    int            id;
 
+   void *output;
+
    Eina_Rectangle useful_geometry[2];
    char *randr2_id; // same id we get from randr2 so look it up there
    Eina_Bool useful_geometry_changed : 1;

--