e_comp_wl/e_comp_wl_rsm: add log for mapping/unmapping window

Change-Id: I5a413673d65832711b2297aa76c8117d399cf656

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index d6df58b..2f033d7 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2528,12 +2528,15 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
              if ((ec->comp_data->shell.surface) &&
                  (ec->comp_data->shell.unmap))
                {
+                  ELOGF("COMP", "Try to unmap. Call shell.unmap.", ec->pixmap, ec);
                   ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
                }
              else if ((ec->internal) ||
                       (ec->comp_data->sub.data) ||
                       (ec == e_comp_wl->drag_client))
                {
+                  ELOGF("COMP", "Try to unmap. Hide window. internal:%d, sub:%p, drag:%d",
+                        ec->pixmap, ec, ec->internal, ec->comp_data->sub.data, (ec == e_comp_wl->drag_client));
                   ec->visible = EINA_FALSE;
                   evas_object_hide(ec->frame);
                   ec->comp_data->mapped = 0;
@@ -2554,12 +2557,15 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
              if ((ec->comp_data->shell.surface) &&
                  (ec->comp_data->shell.map))
                {
+                  ELOGF("COMP", "Try to map. Call shell.map.", ec->pixmap, ec);
                   ec->comp_data->shell.map(ec->comp_data->shell.surface);
                }
              else if ((ec->internal) ||
                       (_e_comp_wl_subsurface_can_show(ec)) ||
                       (ec == e_comp_wl->drag_client))
                {
+                  ELOGF("COMP", "Try to map. Show window. internal:%d, drag:%d",
+                        ec->pixmap, ec, ec->internal, (ec == e_comp_wl->drag_client));
                   ec->visible = EINA_TRUE;
                   ec->ignored = 0;
                   evas_object_show(ec->frame);
@@ -2793,7 +2799,8 @@ _e_comp_wl_surface_cb_attach(struct wl_client *client EINA_UNUSED, struct wl_res
 
    if (!ec->comp_data->mapped)
      {
-        if (!(ec->internal || ec->comp_data->sub.data))
+        if (ec->comp_data->shell.surface &&
+            !ec->internal && !ec->comp_data->sub.data && !ec->remote_surface.provider)
           {
              ELOGF("COMP", "Current unmapped. ATTACH buffer:%p", ec->pixmap, ec, buffer);
           }
@@ -2954,7 +2961,8 @@ _e_comp_wl_surface_cb_commit(struct wl_client *client EINA_UNUSED, struct wl_res
 
    if (!ec->comp_data->mapped)
      {
-        if (!(ec->internal || ec->comp_data->sub.data))
+        if (ec->comp_data->shell.surface &&
+            !ec->internal && !ec->comp_data->sub.data && !ec->remote_surface.provider)
           {
              ELOGF("COMP", "Current unmapped. COMMIT. pixmap_usable:%d", ec->pixmap, ec, e_pixmap_usable_get(ec->pixmap));
           }
@@ -4957,10 +4965,15 @@ e_comp_wl_surface_commit(E_Client *ec)
         if (ec->comp_data->mapped)
           {
              if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap))
-               ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
+               {
+                  ELOGF("COMP", "Try to unmap2. Call shell.unmap.", ec->pixmap, ec);
+                  ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
+               }
              else if (e_client_has_xwindow(ec) || ec->internal || ec->comp_data->sub.data ||
                       (ec == e_comp_wl->drag_client))
                {
+                  ELOGF("COMP", "Try to unmap2. Hide window. internal:%d, sub:%p, drag:%d",
+                        ec->pixmap, ec, ec->internal, ec->comp_data->sub.data, (ec == e_comp_wl->drag_client));
                   ec->visible = EINA_FALSE;
                   evas_object_hide(ec->frame);
                   ec->comp_data->mapped = 0;
@@ -4975,10 +4988,15 @@ e_comp_wl_surface_commit(E_Client *ec)
         if (!ec->comp_data->mapped)
           {
              if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.map))
-               ec->comp_data->shell.map(ec->comp_data->shell.surface);
+               {
+                  ELOGF("COMP", "Try to map2. Call shell.map.", ec->pixmap, ec);
+                  ec->comp_data->shell.map(ec->comp_data->shell.surface);
+               }
              else if (e_client_has_xwindow(ec) || ec->internal || _e_comp_wl_subsurface_can_show(ec) ||
                       (ec == e_comp_wl->drag_client))
                {
+                  ELOGF("COMP", "Try to map2. Show window. internal:%d, drag:%d",
+                        ec->pixmap, ec, ec->internal, (ec == e_comp_wl->drag_client));
                   ec->visible = EINA_TRUE;
                   ec->ignored = 0;
                   evas_object_show(ec->frame);

diff --git a/src/bin/e_comp_wl_rsm.c b/src/bin/e_comp_wl_rsm.c
index 7f7d8d2..77a58c8 100644 (file)
--- a/src/bin/e_comp_wl_rsm.c
+++ b/src/bin/e_comp_wl_rsm.c
@@ -359,7 +359,10 @@ _remote_provider_offscreen_set(E_Comp_Wl_Remote_Provider* provider, Eina_Bool se
         //TODO: consider what happens if it's not normal client such as subsurface client
         //TODO: save original values
         if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap))
-          ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
+          {
+             ELOGF("COMP", "Call shell.unmap by rsm", ec->pixmap, ec);
+             ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
+          }
         else
           {
              ec->visible = EINA_FALSE;