Revert "e_client: use e_client_first_mapped_get() function instead of ec->first_mapped"

This reverts commit a3c87d6c955548848b2a3f8351c9f4ffde4c8915.

Change-Id: I7673e23f79be45238c1ac9dea07eb01d4badc047

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index b5f4b77..632fddf 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -3338,7 +3338,7 @@ _e_client_visibility_zone_calculate(E_Zone *zone)
         /* if ec is subsurface, skip this */
         cdata = e_client_cdata_get(ec);
         if (cdata && cdata->sub.data) continue;
-        if ((!e_client_first_mapped_get(ec)) &&
+        if ((!ec->first_mapped) &&
             (e_comp_object_content_type_get(ec->frame) == E_COMP_OBJECT_CONTENT_TYPE_INT_IMAGE)) continue;
 
         /* TODO: need to check whether window intersects with entire screen, not zone. */

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index f6e92d6..37c2423 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -1224,7 +1224,7 @@ _e_comp_object_animating_end(E_Comp_Object *cw)
                          {
                             ELOGF("COMP", "Un-Set launching flag..", cw->ec);
                             cw->ec->launching = EINA_FALSE;
-                            if (e_client_first_mapped_get(cw->ec))
+                            if (cw->ec->first_mapped)
                               {
                                  ELOGF("LAUNCH", "SHOW real win", cw->ec);
                                  e_comp_object_signal_emit(cw->ec->frame, "e,action,launch_real,done", "e");

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 4b30038..65ae5ca 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2814,7 +2814,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
    /* put state input into surface */
    if ((state->input) &&
        (!eina_tiler_empty(state->input)) &&
-       e_client_first_mapped_get(ec))
+       ec->first_mapped)
      {
         Eina_Tiler *src, *tmp;
         int sw, sh;

diff --git a/src/bin/e_comp_wl_shell.c b/src/bin/e_comp_wl_shell.c
index 053e99d..7074791 100644 (file)
--- a/src/bin/e_comp_wl_shell.c
+++ b/src/bin/e_comp_wl_shell.c
@@ -884,7 +884,7 @@ _e_shell_surface_map(struct wl_resource *resource)
         ELOGF("SHELL",
               "spash:%d, first_mapped:%d, iconic:%d(client:%d), raise:%d, lower:%d, ignore:%d, override:%d, input_only:%d",
               ec,
-              ec->use_splash, e_client_first_mapped_get(ec), ec->iconic, ec->exp_iconify.by_client,
+              ec->use_splash, ec->first_mapped, ec->iconic, ec->exp_iconify.by_client,
               ec->post_raise, ec->post_lower, ec->ignored, ec->override, ec->input_only);
 
         _e_shell_client_map_common_pre(ec);
@@ -1403,7 +1403,7 @@ _e_xdg_shell_surface_map_cb_timer(void *data)
         ELOGF("SHELL",
               "spash:%d, first_mapped:%d, iconic:%d(client:%d), raise:%d, lower:%d, ignore:%d, override:%d, input_only:%d",
               ec,
-              ec->use_splash, e_client_first_mapped_get(ec), ec->iconic, ec->exp_iconify.by_client,
+              ec->use_splash, ec->first_mapped, ec->iconic, ec->exp_iconify.by_client,
               ec->post_raise, ec->post_lower, ec->ignored, ec->override, ec->input_only);
 
         _e_shell_client_map_common_pre(ec);
@@ -1484,7 +1484,7 @@ e_shell_e_client_map(E_Client *ec)
    ELOGF("SHELL",
          "spash:%d, first_mapped:%d, iconic:%d(client:%d), raise:%d, lower:%d, ignore:%d, override:%d, input_only:%d",
          ec,
-         ec->use_splash, e_client_first_mapped_get(ec), ec->iconic, ec->exp_iconify.by_client,
+         ec->use_splash, ec->first_mapped, ec->iconic, ec->exp_iconify.by_client,
          ec->post_raise, ec->post_lower, ec->ignored, ec->override, ec->input_only);
 
    _e_shell_client_map_common_pre(ec);

diff --git a/src/bin/e_policy_visibility.c b/src/bin/e_policy_visibility.c
index 85cafc5..9447151 100644 (file)
--- a/src/bin/e_policy_visibility.c
+++ b/src/bin/e_policy_visibility.c
@@ -1698,7 +1698,7 @@ _e_vis_ec_above_visible_type(E_Client *ec, Eina_Bool check_child)
         if (e_client_util_ignored_get(above)) continue;
         if (above->frame && evas_object_data_get(above->frame, "comp_skip")) continue;
         if (check_child && (above->parent == ec)) continue;
-        if (e_client_first_mapped_get(above))
+        if (above->first_mapped)
           {
              if (!e_client_mapped_get(above))
                continue;

diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c
index f7a803e..263e54f 100644 (file)
--- a/src/bin/e_policy_wl.c
+++ b/src/bin/e_policy_wl.c
@@ -5805,7 +5805,7 @@ _launch_splash_off(E_Policy_Wl_Tzlaunch_Splash *tzlaunch_splash)
              /* to send launch,done event to launchscreen client */
              if (!e_object_is_del(E_OBJECT(ec)))
                {
-                  if (e_client_first_mapped_get(ec))
+                  if (ec->first_mapped)
                     {
                        ELOGF("LAUNCH", "SHOW real win by replaced splash ec", ec);
                        e_comp_object_signal_emit(ec->frame, "e,action,launch_real,done", "e");

diff --git a/src/bin/services/e_service_launcher.c b/src/bin/services/e_service_launcher.c
index 1ec406d..4479097 100644 (file)
--- a/src/bin/services/e_service_launcher.c
+++ b/src/bin/services/e_service_launcher.c
@@ -1325,7 +1325,7 @@ _launcher_cb_launch_done(struct wl_client *client EINA_UNUSED,
                   ELOGF("COMP", "Un-Set launching flag..", target_ec);
                   target_ec->launching = EINA_FALSE;
 
-                  if (e_client_first_mapped_get(target_ec))
+                  if (target_ec->first_mapped)
                     {
                        ELOGF("LAUNCH", "SHOW real win (target->frame:%p, map:%d) by launcher service (win:0x%08zx, ec:%p).", target_ec, target_ec->frame, e_client_mapped_get(target_ec), e_client_util_win_get(lc->ec), lc->ec);
                        e_comp_object_signal_emit(target_ec->frame, "e,action,launch_real,done", "e");