From 29617bf80bdeed8e648d6de0ebd338aab28eea1a Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Fri, 4 Aug 2017 16:23:38 -0400
Subject: [PATCH] move Ecore_X_Stack_Type member from client to x11 comp_data

no functional changes
---
 src/bin/e_client.h | 4 +---
 src/bin/e_comp_x.c | 5 +++--
 src/bin/e_comp_x.h | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bin/e_client.h b/src/bin/e_client.h
index c09feac85..5bc50fa5d 100644
--- a/src/bin/e_client.h
+++ b/src/bin/e_client.h
@@ -527,9 +527,7 @@ struct E_Client
             unsigned char     wait_for_done : 1;
             unsigned char     use : 1;
          } profile;
-#ifndef HAVE_WAYLAND_ONLY
-         Ecore_X_Stack_Type stack;
-#endif
+         Eina_Bool stack : 1;
          unsigned char      centered : 1;
          unsigned char      video : 1;
       } state;
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 24ee4163b..d9f9d82ee 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -3437,7 +3437,8 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
      }
    if (ec->e.fetch.stack)
      {
-        ec->e.state.stack = ecore_x_e_stack_type_get(win);
+        cd->stack = ecore_x_e_stack_type_get(win);
+        ec->e.state.stack = !!cd->stack;
         ec->e.fetch.stack = 0;
      }
    if (ec->e.fetch.profile)
@@ -3864,7 +3865,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
         e_client_parent_set(ec, ec_parent);
         if (ec->parent && (!e_client_util_ignored_get(ec)) && ec->netwm.state.modal)
           _e_comp_x_client_modal_setup(ec);
-        if ((ec_parent) && (ec->e.state.stack != ECORE_X_STACK_NONE))
+        if ((ec_parent) && (cd->stack != ECORE_X_STACK_NONE))
           {
              E_Client *ec2;
 
diff --git a/src/bin/e_comp_x.h b/src/bin/e_comp_x.h
index 2ff0858f0..1217e844b 100644
--- a/src/bin/e_comp_x.h
+++ b/src/bin/e_comp_x.h
@@ -89,6 +89,7 @@ struct _E_Comp_X_Client_Data
          Ecore_X_Illume_Window_State state;
       } win_state;
    } illume;
+   Ecore_X_Stack_Type stack;
 #ifdef HAVE_WAYLAND
    uint32_t surface_id;
 #endif