From: SooChan Lim Date: Thu, 29 Oct 2020 03:14:22 +0000 (+0900) Subject: e_client: use e_client_first_mapped_get() function instead of ec->first_mapped X-Git-Tag: submit/tizen/20201102.081405~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a3c87d6c955548848b2a3f8351c9f4ffde4c8915;p=platform%2Fupstream%2Fenlightenment.git e_client: use e_client_first_mapped_get() function instead of ec->first_mapped Change-Id: I1ad41755ef726e3bb99501a4b26689df4252328e --- diff --git a/src/bin/e_client.c b/src/bin/e_client.c index d59c93f8b6..bcbae5324a 100644 --- 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 ((!ec->first_mapped) && + if ((!e_client_first_mapped_get(ec)) && (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 37c242361b..f6e92d65c2 100644 --- 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 (cw->ec->first_mapped) + if (e_client_first_mapped_get(cw->ec)) { 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 65ae5cae37..4b30038352 100644 --- 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)) && - ec->first_mapped) + e_client_first_mapped_get(ec)) { 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 7074791d41..053e99ddb4 100644 --- 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, ec->first_mapped, ec->iconic, ec->exp_iconify.by_client, + ec->use_splash, e_client_first_mapped_get(ec), 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, ec->first_mapped, ec->iconic, ec->exp_iconify.by_client, + ec->use_splash, e_client_first_mapped_get(ec), 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, ec->first_mapped, ec->iconic, ec->exp_iconify.by_client, + ec->use_splash, e_client_first_mapped_get(ec), 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 8de2336598..21388945c9 100644 --- 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 (above->first_mapped) + if (e_client_first_mapped_get(above)) { if (!e_client_mapped_get(above)) continue; diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c index 8217c148d0..372a6a9df6 100644 --- a/src/bin/e_policy_wl.c +++ b/src/bin/e_policy_wl.c @@ -5792,7 +5792,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 (ec->first_mapped) + if (e_client_first_mapped_get(ec)) { 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 4479097414..1ec406d621 100644 --- 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 (target_ec->first_mapped) + if (e_client_first_mapped_get(target_ec)) { 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");