From: SooChan Lim Date: Tue, 3 Nov 2020 02:24:33 +0000 (+0900) Subject: Revert "e_client: use e_client_mapped_set() function" X-Git-Tag: submit/tizen/20201103.033023~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8981c227b6d7bce6e34a29e1c8e96c74830f43c7;p=platform%2Fupstream%2Fenlightenment.git Revert "e_client: use e_client_mapped_set() function" This reverts commit f5e6e1fc8f2a65774233529ced93d06ab5d191a5. Change-Id: Id73e777960fe9a46dffa8dbcfb81d578873e49fb --- diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 42b91ad6b5..4b30038352 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -2624,7 +2624,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state) ec, ec->internal, cdata->sub.data, (ec == e_comp_wl->drag_client)); ec->visible = EINA_FALSE; evas_object_hide(ec->frame); - e_client_mapped_set(ec, EINA_FALSE); + cdata->mapped = 0; } } @@ -2655,7 +2655,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state) ec->visible = EINA_TRUE; ec->ignored = 0; evas_object_show(ec->frame); - e_client_mapped_set(ec, EINA_TRUE); + cdata->mapped = 1; } } @@ -3671,7 +3671,7 @@ _e_comp_wl_client_cb_new(void *data EINA_UNUSED, E_Client *ec) ec->icccm.delete_request = EINA_TRUE; /* set initial client data properties */ - cdata->mapped = EINA_FALSE; // TODO: e_client_cdata_mapped_set(cdata); + cdata->mapped = EINA_FALSE; cdata->first_damage = ec->internal; cdata->need_reparent = !ec->internal; @@ -4522,7 +4522,7 @@ e_comp_wl_surface_commit(E_Client *ec) ec, ec->internal, cdata->sub.data, (ec == e_comp_wl->drag_client)); ec->visible = EINA_FALSE; evas_object_hide(ec->frame); - e_client_mapped_set(ec, EINA_FALSE); + cdata->mapped = 0; } } @@ -4547,7 +4547,7 @@ e_comp_wl_surface_commit(E_Client *ec) ec->visible = EINA_TRUE; ec->ignored = 0; evas_object_show(ec->frame); - e_client_mapped_set(ec, EINA_TRUE); + cdata->mapped = 1; } } diff --git a/src/bin/e_comp_wl_rsm.c b/src/bin/e_comp_wl_rsm.c index 0d3d589719..e721089e3d 100644 --- a/src/bin/e_comp_wl_rsm.c +++ b/src/bin/e_comp_wl_rsm.c @@ -396,7 +396,7 @@ _remote_provider_offscreen_set(E_Comp_Wl_Remote_Provider* provider, Eina_Bool se { ec->visible = EINA_FALSE; evas_object_hide(ec->frame); - e_client_mapped_set(ec, EINA_FALSE); + cdata->mapped = 0; } ec->icccm.accepts_focus = ec->icccm.take_focus = ec->want_focus = EINA_FALSE; diff --git a/src/bin/e_comp_wl_shell.c b/src/bin/e_comp_wl_shell.c index 6e55ee20a5..053e99ddb4 100644 --- a/src/bin/e_comp_wl_shell.c +++ b/src/bin/e_comp_wl_shell.c @@ -776,7 +776,11 @@ _e_shell_surface_ping(struct wl_resource *resource) static void _e_shell_client_map_common_pre(E_Client *ec) { + E_Comp_Wl_Client_Data *cdata = NULL; + if (!ec) return; + cdata = e_client_cdata_get(ec); + if (!cdata) return; e_comp_object_signal_emit(ec->frame, "e,state,map", "e"); @@ -796,7 +800,7 @@ _e_shell_client_map_common_pre(E_Client *ec) /* map this surface if needed */ ec->visible = EINA_TRUE; evas_object_show(ec->frame); - e_client_mapped_set(ec, EINA_TRUE); + cdata->mapped = EINA_TRUE; } static void @@ -1514,8 +1518,11 @@ _e_xdg_shell_surface_map(struct wl_resource *resource) EINTERN void e_shell_e_client_unmap(E_Client *ec) { + E_Comp_Wl_Client_Data *cdata = NULL; + E_FREE_FUNC(ec->map_timer, ecore_timer_del); + cdata = e_client_cdata_get(ec); if (e_client_mapped_get(ec)) { e_comp_object_signal_emit(ec->frame, "e,state,unmap", "e"); @@ -1525,7 +1532,7 @@ e_shell_e_client_unmap(E_Client *ec) ec->visible = EINA_FALSE; evas_object_hide(ec->frame); - e_client_mapped_set(ec, EINA_FALSE); + cdata->mapped = EINA_FALSE; ec->visibility.last_sent_type = E_VISIBILITY_UNKNOWN; ELOGF("SHELL", diff --git a/src/bin/e_comp_wl_subsurface.c b/src/bin/e_comp_wl_subsurface.c index 05430f0a71..649e1ece83 100644 --- a/src/bin/e_comp_wl_subsurface.c +++ b/src/bin/e_comp_wl_subsurface.c @@ -269,7 +269,7 @@ _e_comp_wl_subsurface_show(E_Client *ec) { subc->visible = EINA_TRUE; evas_object_show(subc->frame); - e_client_mapped_set(subc, EINA_TRUE); + subc_cdata->mapped = 1; } _e_comp_wl_subsurface_show(subc); } @@ -284,7 +284,7 @@ _e_comp_wl_subsurface_show(E_Client *ec) { subc->visible = EINA_TRUE; evas_object_show(subc->frame); - e_client_mapped_set(subc, EINA_TRUE); + subc_cdata->mapped = 1; } _e_comp_wl_subsurface_show(subc); } @@ -314,7 +314,7 @@ _e_comp_wl_subsurface_hide(E_Client *ec) { subc->visible = EINA_FALSE; evas_object_hide(subc->frame); - e_client_mapped_set(subc, EINA_FALSE); + sub_cdata->mapped = 0; } _e_comp_wl_subsurface_hide(subc); } @@ -331,7 +331,7 @@ _e_comp_wl_subsurface_hide(E_Client *ec) { subc->visible = EINA_FALSE; evas_object_hide(subc->frame); - e_client_mapped_set(subc, EINA_FALSE); + sub_cdata->mapped = 0; } _e_comp_wl_subsurface_hide(subc); } diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c index 1b06dc46ed..59d0bcddd9 100644 --- a/src/bin/e_pointer.c +++ b/src/bin/e_pointer.c @@ -158,6 +158,7 @@ EINTERN void e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int x, int y) { E_Client *ec; + E_Comp_Wl_Client_Data *cdata = NULL; EINA_SAFETY_ON_NULL_RETURN(ptr); @@ -176,10 +177,11 @@ e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int x, int y) ec = e_comp_object_client_get(ptr->o_ptr); if ((ec) && (!e_object_is_del(E_OBJECT(ec)))) { + cdata = e_client_cdata_get(ec); ec->hidden = 1; ec->visible = EINA_FALSE; ec->visibility.obscured = E_VISIBILITY_FULLY_OBSCURED; - e_client_mapped_set(ec, EINA_FALSE); + cdata->mapped = EINA_FALSE; ec->override = 1; /* ignore the previous cursor_ec */ } @@ -202,11 +204,12 @@ e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int x, int y) ec = e_comp_object_client_get(obj); if (ec && e_pixmap_usable_get(ec->pixmap)) { + cdata = e_client_cdata_get(ec); ec->hidden = 0; ec->visible = EINA_TRUE; ec->visibility.obscured = E_VISIBILITY_UNOBSCURED; evas_object_geometry_set(ec->frame, ec->x, ec->y, ec->w, ec->h); - e_client_mapped_set(ec, EINA_TRUE); + cdata->mapped = EINA_TRUE; ec->override = 0; /* do not ignore the cursor_ec to set the image object */ if (e_comp_is_on_overlay(ec))