Revert "e_client: use e_client_mapped_set() function"

This reverts commit f5e6e1fc8f2a65774233529ced93d06ab5d191a5.

Change-Id: Id73e777960fe9a46dffa8dbcfb81d578873e49fb

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 42b91ad6b5f670dcbd433d8aae3d620bbad558fa..4b30038352eacfa1544d623e86a11f561bf0135e 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2624,7 +2624,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
                         ec, ec->internal, cdata->sub.data, (ec == e_comp_wl->drag_client));
                   ec->visible = EINA_FALSE;
                   evas_object_hide(ec->frame);
-                  e_client_mapped_set(ec, EINA_FALSE);
+                  cdata->mapped = 0;
                }
           }
 
@@ -2655,7 +2655,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
                   ec->visible = EINA_TRUE;
                   ec->ignored = 0;
                   evas_object_show(ec->frame);
-                  e_client_mapped_set(ec, EINA_TRUE);
+                  cdata->mapped = 1;
                }
           }
 
@@ -3671,7 +3671,7 @@ _e_comp_wl_client_cb_new(void *data EINA_UNUSED, E_Client *ec)
      ec->icccm.delete_request = EINA_TRUE;
 
    /* set initial client data properties */
-   cdata->mapped = EINA_FALSE; // TODO: e_client_cdata_mapped_set(cdata);
+   cdata->mapped = EINA_FALSE;
    cdata->first_damage = ec->internal;
 
    cdata->need_reparent = !ec->internal;
@@ -4522,7 +4522,7 @@ e_comp_wl_surface_commit(E_Client *ec)
                         ec, ec->internal, cdata->sub.data, (ec == e_comp_wl->drag_client));
                   ec->visible = EINA_FALSE;
                   evas_object_hide(ec->frame);
-                  e_client_mapped_set(ec, EINA_FALSE);
+                  cdata->mapped = 0;
                }
           }
 
@@ -4547,7 +4547,7 @@ e_comp_wl_surface_commit(E_Client *ec)
                   ec->visible = EINA_TRUE;
                   ec->ignored = 0;
                   evas_object_show(ec->frame);
-                  e_client_mapped_set(ec, EINA_TRUE);
+                  cdata->mapped = 1;
                }
           }
 

diff --git a/src/bin/e_comp_wl_rsm.c b/src/bin/e_comp_wl_rsm.c
index 0d3d589719f7b8040e1c21fa8fd01167008f4504..e721089e3dbfa064fc977ce9f72875a42f310be5 100644 (file)
--- a/src/bin/e_comp_wl_rsm.c
+++ b/src/bin/e_comp_wl_rsm.c
@@ -396,7 +396,7 @@ _remote_provider_offscreen_set(E_Comp_Wl_Remote_Provider* provider, Eina_Bool se
           {
              ec->visible = EINA_FALSE;
              evas_object_hide(ec->frame);
-             e_client_mapped_set(ec, EINA_FALSE);
+             cdata->mapped = 0;
           }
 
         ec->icccm.accepts_focus = ec->icccm.take_focus = ec->want_focus = EINA_FALSE;

diff --git a/src/bin/e_comp_wl_shell.c b/src/bin/e_comp_wl_shell.c
index 6e55ee20a5dd67ea401496f667f50a3a5401a4cd..053e99ddb4c0303e1be68d40670cb45a8bfaa532 100644 (file)
--- a/src/bin/e_comp_wl_shell.c
+++ b/src/bin/e_comp_wl_shell.c
@@ -776,7 +776,11 @@ _e_shell_surface_ping(struct wl_resource *resource)
 static void
 _e_shell_client_map_common_pre(E_Client *ec)
 {
+   E_Comp_Wl_Client_Data *cdata = NULL;
+
    if (!ec) return;
+   cdata = e_client_cdata_get(ec);
+   if (!cdata) return;
 
    e_comp_object_signal_emit(ec->frame, "e,state,map", "e");
 
@@ -796,7 +800,7 @@ _e_shell_client_map_common_pre(E_Client *ec)
    /* map this surface if needed */
    ec->visible = EINA_TRUE;
    evas_object_show(ec->frame);
-   e_client_mapped_set(ec, EINA_TRUE);
+   cdata->mapped = EINA_TRUE;
 }
 
 static void
@@ -1514,8 +1518,11 @@ _e_xdg_shell_surface_map(struct wl_resource *resource)
 EINTERN void
 e_shell_e_client_unmap(E_Client *ec)
 {
+   E_Comp_Wl_Client_Data *cdata = NULL;
+
    E_FREE_FUNC(ec->map_timer, ecore_timer_del);
 
+   cdata = e_client_cdata_get(ec);
    if (e_client_mapped_get(ec))
      {
         e_comp_object_signal_emit(ec->frame, "e,state,unmap", "e");
@@ -1525,7 +1532,7 @@ e_shell_e_client_unmap(E_Client *ec)
 
         ec->visible = EINA_FALSE;
         evas_object_hide(ec->frame);
-        e_client_mapped_set(ec, EINA_FALSE);
+        cdata->mapped = EINA_FALSE;
         ec->visibility.last_sent_type = E_VISIBILITY_UNKNOWN;
 
         ELOGF("SHELL",

diff --git a/src/bin/e_comp_wl_subsurface.c b/src/bin/e_comp_wl_subsurface.c
index 05430f0a710b97109fe9736a1bcddc74227852d7..649e1ece83a8ecd1af3350a874a932d1e1412d3a 100644 (file)
--- a/src/bin/e_comp_wl_subsurface.c
+++ b/src/bin/e_comp_wl_subsurface.c
@@ -269,7 +269,7 @@ _e_comp_wl_subsurface_show(E_Client *ec)
           {
              subc->visible = EINA_TRUE;
              evas_object_show(subc->frame);
-             e_client_mapped_set(subc, EINA_TRUE);
+             subc_cdata->mapped = 1;
           }
         _e_comp_wl_subsurface_show(subc);
      }
@@ -284,7 +284,7 @@ _e_comp_wl_subsurface_show(E_Client *ec)
           {
              subc->visible = EINA_TRUE;
              evas_object_show(subc->frame);
-             e_client_mapped_set(subc, EINA_TRUE);
+             subc_cdata->mapped = 1;
           }
         _e_comp_wl_subsurface_show(subc);
      }
@@ -314,7 +314,7 @@ _e_comp_wl_subsurface_hide(E_Client *ec)
                {
                   subc->visible = EINA_FALSE;
                   evas_object_hide(subc->frame);
-                  e_client_mapped_set(subc, EINA_FALSE);
+                  sub_cdata->mapped = 0;
                }
              _e_comp_wl_subsurface_hide(subc);
           }
@@ -331,7 +331,7 @@ _e_comp_wl_subsurface_hide(E_Client *ec)
                {
                   subc->visible = EINA_FALSE;
                   evas_object_hide(subc->frame);
-                  e_client_mapped_set(subc, EINA_FALSE);
+                  sub_cdata->mapped = 0;
                }
              _e_comp_wl_subsurface_hide(subc);
           }

diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index 1b06dc46edb40a7b813218eb772cdac84d95be7d..59d0bcddd999247b21b20e999e0357e70559a23e 100644 (file)
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -158,6 +158,7 @@ EINTERN void
 e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int x, int y)
 {
    E_Client *ec;
+   E_Comp_Wl_Client_Data *cdata = NULL;
 
    EINA_SAFETY_ON_NULL_RETURN(ptr);
 
@@ -176,10 +177,11 @@ e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int x, int y)
         ec = e_comp_object_client_get(ptr->o_ptr);
         if ((ec) && (!e_object_is_del(E_OBJECT(ec))))
           {
+             cdata = e_client_cdata_get(ec);
              ec->hidden = 1;
              ec->visible = EINA_FALSE;
              ec->visibility.obscured = E_VISIBILITY_FULLY_OBSCURED;
-             e_client_mapped_set(ec, EINA_FALSE);
+             cdata->mapped = EINA_FALSE;
              ec->override = 1; /* ignore the previous cursor_ec */
           }
 
@@ -202,11 +204,12 @@ e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int x, int y)
         ec = e_comp_object_client_get(obj);
         if (ec && e_pixmap_usable_get(ec->pixmap))
           {
+             cdata = e_client_cdata_get(ec);
              ec->hidden = 0;
              ec->visible = EINA_TRUE;
              ec->visibility.obscured = E_VISIBILITY_UNOBSCURED;
              evas_object_geometry_set(ec->frame, ec->x, ec->y, ec->w, ec->h);
-             e_client_mapped_set(ec, EINA_TRUE);
+             cdata->mapped = EINA_TRUE;
              ec->override = 0; /* do not ignore the cursor_ec to set the image object */
 
              if (e_comp_is_on_overlay(ec))