From a0a549d8a487e5d71256e6282987991a1d112235 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Fri, 7 Jul 2023 19:25:32 +0900 Subject: [PATCH] e_comp: use the e_comp_client_zone_is_displaying function instead of ec->zone->display_state Change-Id: Ib8bf138a03c1958ef5dbf0d09441215a15e5563d --- src/bin/e_client.c | 2 +- src/bin/e_policy.c | 4 ++-- src/bin/e_policy_visibility.c | 8 ++++---- src/bin/e_policy_wl.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index fc83c80..5aab25e 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -991,7 +991,7 @@ _e_client_revert_focus_get(E_Client *ec) if (!ec->zone) return NULL; desk = e_desk_current_get(ec->zone); if (!desk) return NULL; - if (ec->zone->display_state == E_ZONE_DISPLAY_STATE_OFF) return NULL; + if (!e_comp_client_zone_is_displaying(ec)) return NULL; if (e_config->focus_policy == E_FOCUS_MOUSE) { diff --git a/src/bin/e_policy.c b/src/bin/e_policy.c index 3af13c7..c82a26d 100644 --- a/src/bin/e_policy.c +++ b/src/bin/e_policy.c @@ -735,7 +735,7 @@ _e_policy_cb_hook_client_visibility(void *d EINA_UNUSED, E_Client *ec) E_Client *above_ec; Evas_Object *o; - if (ec->zone->display_state == E_ZONE_DISPLAY_STATE_ON) + if (e_comp_client_zone_is_displaying(ec)) { e_client_geometry_get(ec, &ex, &ey, &ew, &eh); // crop ec size with zone size @@ -801,7 +801,7 @@ _e_policy_cb_hook_client_visibility(void *d EINA_UNUSED, E_Client *ec) e_policy_client_iconify_by_visibility(ec); } } - else if (ec->zone->display_state == E_ZONE_DISPLAY_STATE_OFF) + else { e_policy_client_iconify_by_visibility(ec); } diff --git a/src/bin/e_policy_visibility.c b/src/bin/e_policy_visibility.c index 0ccf0c0..811af20 100644 --- a/src/bin/e_policy_visibility.c +++ b/src/bin/e_policy_visibility.c @@ -290,7 +290,7 @@ _e_policy_client_iconify_by_visibility(E_Client *ec) } } - if (ec->zone->display_state != E_ZONE_DISPLAY_STATE_OFF) + if (e_comp_client_zone_is_displaying(ec)) { // check above window is alpha opaque or not if (_e_policy_check_above_alpha_opaque(ec)) @@ -1454,7 +1454,7 @@ _e_vis_client_check_send_pre_visibility(E_Vis_Client *vc, Eina_Bool raise) if (_e_vis_client_is_uniconic(vc)) return EINA_FALSE; - if (ec->zone->display_state == E_ZONE_DISPLAY_STATE_OFF) + if (!e_comp_client_zone_is_displaying(ec)) return EINA_FALSE; // check all windows on above layers, if obscured by above then return FALSE @@ -1497,7 +1497,7 @@ _e_vis_client_add_uniconify_render_pending(E_Vis_Client *vc, E_Vis_Job_Type type ec = vc->ec; - if (ec->zone->display_state == E_ZONE_DISPLAY_STATE_OFF) + if (!e_comp_client_zone_is_displaying(ec)) { VS_DBG(ec, "Display off. no need to uniconify render."); return EINA_FALSE; @@ -1886,7 +1886,7 @@ _e_vis_ec_below_uniconify(E_Client *ec, E_Pol_Vis_Type above_vis_type) if (ec->zone) { - if (ec->zone->display_state == E_ZONE_DISPLAY_STATE_OFF) + if (!e_comp_client_zone_is_displaying(ec)) return EINA_FALSE; } diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c index 182b2c6..a599ba4 100644 --- a/src/bin/e_policy_wl.c +++ b/src/bin/e_policy_wl.c @@ -1100,7 +1100,7 @@ e_policy_wl_visibility_send(E_Client *ec, int vis) // below code is workaround for checking visibility by display off or not if (ec->zone) { - if (ec->zone->display_state == E_ZONE_DISPLAY_STATE_ON) + if (e_comp_client_zone_is_displaying(ec)) e_policy_aux_message_send(ec, "dpms_wm", "on", NULL); else e_policy_aux_message_send(ec, "dpms_wm", "off", NULL); -- 2.7.4