From 374ed74049312a5b755a6d2fda353ca2237f08e5 Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Tue, 5 Jul 2022 09:25:35 +0100
Subject: [PATCH] win - first map - fix energyxt unmap bug by wiping ignore
 unmap

For some reason I have yet to divine we don't get an initial unmap
event due to the reparent of the energyxt dialog windows and the
"ignore that first unmap" flag does not get cleared because it doesn't
happen. later when the dialog is withdrawn {9unmapped) this is ignored
then when you close the dialog... thus keeping it around as far as e
is concerned.

so to fix this - add a small timeout to clean this flag after a
show/map.

@fix
---
 src/bin/e_client.c |  2 ++
 src/bin/e_client.h |  1 +
 src/bin/e_comp_x.c | 16 ++++++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 01a1b0bbf..b969a3cf8 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -586,6 +586,8 @@ _e_client_free(E_Client *ec)
    if (ec->stack.prev) ec->stack.prev->stack.next = ec->stack.next;
    if (ec->stack.next) ec->stack.next->stack.prev = ec->stack.prev;
 
+   E_FREE_FUNC(ec->ignore_first_unmap_clear_timer, ecore_timer_del);
+
    ec->e.state.profile.wait_desk = NULL;
    evas_object_del(ec->frame);
    E_OBJECT(ec)->references--;
diff --git a/src/bin/e_client.h b/src/bin/e_client.h
index cc4bc9b1a..304536ae9 100644
--- a/src/bin/e_client.h
+++ b/src/bin/e_client.h
@@ -302,6 +302,7 @@ struct E_Client
 
    unsigned char      ignore_first_unmap;
    E_Pointer_Mode     resize_mode;
+   Ecore_Timer       *ignore_first_unmap_clear_timer;
 
    struct
    {
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 4a38f403b..26ce45024 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -3524,6 +3524,16 @@ _e_comp_x_frame_extents_adjust(E_Client *ec, int exl, int exr, int ext, int exb)
      }
 }
 
+static Eina_Bool
+_cb_e_comp_x_ignore_first_unmap_clear_timer(void *data)
+{
+   E_Client *ec = data;
+
+   ec->ignore_first_unmap_clear_timer = NULL;
+   if (ec->ignore_first_unmap > 0) ec->ignore_first_unmap--;
+   return EINA_FALSE;
+}
+
 static void
 _e_comp_x_hook_client_pre_frame_assign(void *d EINA_UNUSED, E_Client *ec)
 {
@@ -3576,6 +3586,9 @@ _e_comp_x_hook_client_pre_frame_assign(void *d EINA_UNUSED, E_Client *ec)
    if (!ec->internal)
      ecore_x_window_save_set_add(win);
    ec->ignore_first_unmap++;
+   E_FREE_FUNC(ec->ignore_first_unmap_clear_timer, ecore_timer_del);
+   ec->ignore_first_unmap_clear_timer = ecore_timer_add
+     (0.2, _cb_e_comp_x_ignore_first_unmap_clear_timer, ec);
    ecore_x_window_reparent(win, pwin, 0, 0);
    e_pixmap_alias(ep, E_PIXMAP_TYPE_X, pwin);
 
@@ -5807,6 +5820,9 @@ _e_comp_x_manage_windows(void)
                   evas_object_geometry_set(ec->frame, ec->client.x, ec->client.y, ec->client.w, ec->client.h);
                }
              ec->ignore_first_unmap = 1;
+             E_FREE_FUNC(ec->ignore_first_unmap_clear_timer, ecore_timer_del);
+             ec->ignore_first_unmap_clear_timer = ecore_timer_add
+               (0.2, _cb_e_comp_x_ignore_first_unmap_clear_timer, ec);
              if (ec->override || (!ec->icccm.fetch.hints))
                evas_object_show(ec->frame);
              _e_comp_x_client_stack(ec);