Drop ping functionality

The ping functionality hasn't been used for a long time.
This will need to be implemented later if necessary.

Change-Id: I3b7146ed51aeb3b6e7ef61e2e2910b949177ca6b

diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c
index 924b989edf7ce8c050b5a43ed39be04ff80b482e..bc7f81cb4146e2f56e5d749432c4e3b345f0df21 100644 (file)
--- a/src/bin/core/e_client.c
+++ b/src/bin/core/e_client.c
@@ -108,7 +108,6 @@ struct _E_Client_Private
 
         struct wl_signal delete_request;
         struct wl_signal kill_request;
-        struct wl_signal ping;
         struct wl_signal stay_within_margin;
         struct wl_signal mouse_move;
         struct wl_signal virtual_touch;
@@ -681,7 +680,6 @@ _e_client_private_init(E_Client *ec)
    wl_signal_init(&priv->events.subsurface_stack_update);
 
    wl_signal_init(&priv->events.kill_request);
-   wl_signal_init(&priv->events.ping);
    wl_signal_init(&priv->events.stay_within_margin);
    wl_signal_init(&priv->events.mouse_move);
 
@@ -827,8 +825,6 @@ _e_client_del(E_Client *ec)
           e_view_pass_events_set(e_view_client_view_get(PRI(ec)->view_client), true);
      }
 
-   E_FREE_FUNC(ec->ping_poller, ecore_poller_del);
-
    wl_signal_emit_mutable(&PRI(ec)->events.destroy, NULL);
 
    /* must be called before parent/child clear */
@@ -908,51 +904,6 @@ _e_client_cb_kill_timer(void *data)
    return ECORE_CALLBACK_CANCEL;
 }
 
-static Eina_Bool
-_e_client_cb_ping_poller(void *data)
-{
-   E_Client *ec;
-
-   ec = data;
-   if (e_object_is_del(E_OBJECT(ec)))
-     {
-        ec->ping_poller = NULL;
-        return ECORE_CALLBACK_CANCEL;
-     }
-
-   if (ec->ping_ok)
-     {
-        if (ec->hung)
-          {
-             ec->hung = 0;
-             E_FREE_FUNC(ec->kill_timer, ecore_timer_del);
-          }
-     }
-   else
-     {
-        /* if time between last ping and now is greater
-         * than half the ping interval... */
-        if ((ecore_loop_time_get() - ec->ping) >
-            ((e_config->ping_clients_interval *
-              ecore_poller_poll_interval_get(ECORE_POLLER_CORE)) / 2.0))
-          {
-             if (!ec->hung)
-               {
-                  ec->hung = 1;
-                  /* FIXME: if below dialog is up - hide it now */
-               }
-             if (ec->delete_requested)
-               {
-                  /* FIXME: pop up dialog saying app is hung - kill client, or pid */
-                  e_client_act_kill_begin(ec);
-               }
-          }
-     }
-   ec->ping_poller = NULL;
-   e_client_ping(ec);
-   return ECORE_CALLBACK_CANCEL;
-}
-
 ///////////////////////////////////////////
 
 static int
@@ -4353,28 +4304,6 @@ e_client_act_kill_begin(E_Client *ec)
      wl_signal_emit(&PRI(ec)->events.kill_request, ec);
 }
 
-////////////////////////////////////////////
-
-EINTERN void
-e_client_ping(E_Client *ec)
-{
-   E_OBJECT_CHECK(ec);
-   E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
-
-   if (!e_config->ping_clients) return;
-
-   EINA_SAFETY_ON_TRUE_RETURN(e_object_is_del(E_OBJECT(ec)));
-
-   ec->ping_ok = 0;
-   wl_signal_emit(&PRI(ec)->events.ping, ec);
-   ec->ping = ecore_loop_time_get();
-   if (ec->ping_poller) ecore_poller_del(ec->ping_poller);
-   ec->ping_poller = ecore_poller_add(ECORE_POLLER_CORE,
-                                      e_config->ping_clients_interval,
-                                      _e_client_cb_ping_poller, ec);
-}
-
-////////////////////////////////////////////
 E_API void
 e_client_cursor_map_apply(E_Client *ec, int rotation, int x, int y)
 {
@@ -6396,13 +6325,6 @@ e_client_kill_request_listener_add(E_Client *ec, struct wl_listener *listener)
    wl_signal_add(&priv->events.kill_request, listener);
 }
 
-EINTERN void
-e_client_ping_listener_add(E_Client *ec, struct wl_listener *listener)
-{
-   API_ENTRY;
-   wl_signal_add(&priv->events.ping, listener);
-}
-
 EINTERN void
 e_client_stay_within_margin_listener_add(E_Client *ec, struct wl_listener *listener)
 {
@@ -6514,30 +6436,6 @@ e_client_shell_configure(E_Client *ec, Evas_Coord x, Evas_Coord y, Evas_Coord wi
      }
 }
 
-EINTERN void
-e_client_shell_ping(E_Client *ec)
-{
-   E_Desktop_Surface *desktop_surface;
-
-   EINA_SAFETY_ON_NULL_RETURN(ec);
-
-   desktop_surface = _desktop_surface_try_from_ec(ec);
-   if (desktop_surface)
-     {
-        e_desktop_surface_ping(desktop_surface);
-     }
-   else
-     {
-        EINA_SAFETY_ON_NULL_RETURN(ec->comp_data);
-
-        if ((!ec->comp_data->shell.surface) ||
-            (!ec->comp_data->shell.ping))
-          return;
-
-        ec->comp_data->shell.ping(ec->comp_data->shell.surface);
-     }
-}
-
 static void
 _e_input_thread_client_icccm_name_set(void *data)
 {
@@ -7773,14 +7671,14 @@ e_client_parent_get(E_Client *ec)
 E_API void
 e_client_ping_return_set(E_Client *ec, Eina_Bool set)
 {
-   if (ec) ec->ping_ok = set;
+    // Deprecated
 }
 
 E_API Eina_Bool
 e_client_ping_return_get(E_Client *ec)
 {
-   if (!ec) return EINA_FALSE;
-   return ec->ping_ok;
+    // Deprecated
+    return EINA_FALSE;
 }
 
 E_API E_Pixmap *

diff --git a/src/bin/core/e_client_intern.h b/src/bin/core/e_client_intern.h
index 9cb4693368aa47d763d5437644551bc98a9661f6..da11ecbfb5dbfa70032ba85e91ecfb61c8bbfcd4 100644 (file)
--- a/src/bin/core/e_client_intern.h
+++ b/src/bin/core/e_client_intern.h
@@ -54,7 +54,6 @@ EINTERN void          e_client_unfullscreen(E_Client *ec);
 EINTERN void          e_client_stick(E_Client *ec);
 EINTERN void          e_client_unstick(E_Client *ec);
 EINTERN void          e_client_pinned_set(E_Client *ec, Eina_Bool set);
-EINTERN void          e_client_ping(E_Client *cw);
 EINTERN int           e_client_type_update(E_Client *ec);
 EINTERN void          e_client_parent_set(E_Client *ec, E_Client *parent_ec);
 
@@ -228,7 +227,6 @@ EINTERN void e_client_get_bottom_listener_add(E_Client *ec, struct wl_listener *
 EINTERN void e_client_subsurface_stack_update_listener_add(E_Client *ec, struct wl_listener *listener);
 
 EINTERN void e_client_kill_request_listener_add(E_Client *ec, struct wl_listener *listener);
-EINTERN void e_client_ping_listener_add(E_Client *ec, struct wl_listener *listener);
 EINTERN void e_client_stay_within_margin_listener_add(E_Client *ec, struct wl_listener *listener);
 EINTERN void e_client_mouse_move_listener_add(E_Client *ec, struct wl_listener *listener);
 EINTERN void e_client_virtual_touch_listener_add(E_Client *ec, struct wl_listener *listener);
@@ -245,7 +243,6 @@ void e_client_hide_with_show_pending_cancel(E_Client *ec);
 
 Eina_Bool e_client_shell_configure_send(E_Client *ec, uint32_t edges, int32_t width, int32_t height);
 void e_client_shell_configure(E_Client *ec, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height);
-void e_client_shell_ping(E_Client *ec);
 void e_client_shell_unmap(E_Client *ec);
 
 EINTERN void e_client_resize_handle(E_Client *ec);

diff --git a/src/bin/server/e_comp_wl_shell.c b/src/bin/server/e_comp_wl_shell.c
index 76689a227b76648afe471658ab50e71faae5e8c1..aced0cb2f927b1d8ad1bf289aa8cb574adeb1831 100644 (file)
--- a/src/bin/server/e_comp_wl_shell.c
+++ b/src/bin/server/e_comp_wl_shell.c
@@ -64,12 +64,10 @@ e_shell_e_client_shsurface_assign(E_Client *ec,
      {
         cdata->shell.configure_send = api->configure_send;
         cdata->shell.configure = api->configure;
-        cdata->shell.ping = api->ping;
         cdata->shell.map = api->map;
         cdata->shell.unmap = api->unmap;
      }
 
-   ec->netwm.ping = 1;
    e_object_ref(E_OBJECT(ec));
 }
 
@@ -91,7 +89,6 @@ e_shell_e_client_shsurface_api_set(E_Client *ec, E_Shell_Surface_Api *api)
 
    cdata->shell.configure_send = api->configure_send;
    cdata->shell.configure = api->configure;
-   cdata->shell.ping = api->ping;
    cdata->shell.map = api->map;
    cdata->shell.unmap = api->unmap;
 }
@@ -109,7 +106,6 @@ _e_shell_e_client_shsurface_api_reset(E_Client *ec)
 
    cdata->shell.configure_send = NULL;
    cdata->shell.configure = NULL;
-   cdata->shell.ping = NULL;
    cdata->shell.map = NULL;
    cdata->shell.unmap = NULL;
 }
@@ -158,19 +154,6 @@ e_shell_e_client_popup_set(E_Client *ec)
    e_client_layer_set(ec, E_LAYER_CLIENT_POPUP);
 }
 
-EINTERN void
-e_shell_e_client_pong(E_Client *ec)
-{
-   EINA_SAFETY_ON_NULL_RETURN(ec);
-
-   if (e_object_is_del(E_OBJECT(ec))) return;
-
-   ELOGF("SHELL", "Pong", ec);
-
-   ec->ping_ok = EINA_TRUE;
-   ec->hung = EINA_FALSE;
-}
-
 EINTERN void
 e_shell_e_client_parent_set(E_Client *ec, struct wl_resource *parent_resource)
 {

diff --git a/src/bin/server/e_comp_wl_subsurface.c b/src/bin/server/e_comp_wl_subsurface.c
index 2f88cb916c21f3c0a3a429104d1cdb1874190481..9581d1888847edcb4e5a45e13b5380ccc48e1857 100644 (file)
--- a/src/bin/server/e_comp_wl_subsurface.c
+++ b/src/bin/server/e_comp_wl_subsurface.c
@@ -51,7 +51,7 @@ _e_comp_wl_client_subsurface_set(E_Client *ec, E_Comp_Wl_Subsurf_Data *sdata)
    ec->maximized = E_MAXIMIZE_NONE;
    EC_CHANGED(ec);
 
-   ec->new_client = ec->netwm.ping = EINA_TRUE;
+   ec->new_client = EINA_TRUE;
    e_comp_get()->new_clients++;
    e_client_unignore(ec);
 }

diff --git a/src/bin/server/e_desktop_shell.c b/src/bin/server/e_desktop_shell.c
index 366f8e8ce1eb514b992a2fd574ac4aacdf5f901c..efa4017d6795999d880d95809612a1e5accf06d1 100644 (file)
--- a/src/bin/server/e_desktop_shell.c
+++ b/src/bin/server/e_desktop_shell.c
@@ -164,15 +164,6 @@ e_desktop_surface_configure(E_Desktop_Surface *surface, int32_t x, int32_t y, in
      e_client_util_move_resize_without_frame(e_surface_ec_get(surface->surface), x, y, width, height);
 }
 
-EINTERN void
-e_desktop_surface_ping(E_Desktop_Surface *surface)
-{
-   if (!surface->iface)
-     return;
-
-   surface->iface->ping(surface->iface);
-}
-
 EINTERN void
 e_desktop_surface_map(E_Desktop_Surface *surface)
 {

diff --git a/src/bin/server/e_desktop_shell_intern.h b/src/bin/server/e_desktop_shell_intern.h
index 7e32b687ebdaf80b16fcae3ca1529bd821df5933..05c98c7e9dfbdb9525052c097864b24b535b477c 100644 (file)
--- a/src/bin/server/e_desktop_shell_intern.h
+++ b/src/bin/server/e_desktop_shell_intern.h
@@ -46,14 +46,6 @@ void e_desktop_surface_configure_send(E_Desktop_Surface *surface, uint32_t edges
  */
 void e_desktop_surface_configure(E_Desktop_Surface *surface, int32_t x, int32_t y, int32_t width, int32_t height);
 
-/**
- * Ping to the underlying shell surface
- *
- * This function sends a ping event to the underlying shell surface, indicating
- * that it should respond with a pong request.
- */
-void e_desktop_surface_ping(E_Desktop_Surface *surface);
-
 /**
  * Map E_Desktop_Surface instance
  *

diff --git a/src/bin/server/e_desktop_shell_private.h b/src/bin/server/e_desktop_shell_private.h
index 0dcfda822e4f6c9ea6cba9af571f4e6abfdcc9fb..51a619a039cc7d63a7383cd9aab8d81939b5cc4f 100644 (file)
--- a/src/bin/server/e_desktop_shell_private.h
+++ b/src/bin/server/e_desktop_shell_private.h
@@ -9,7 +9,6 @@ struct _E_Desktop_Surface_Interface
 {
    void (*configure_send)(E_Desktop_Surface_Interface *iface, uint32_t edges, int32_t width, int32_t height);
    void (*configure)(E_Desktop_Surface_Interface *iface, int32_t x, int32_t y, int32_t w, int32_t h);
-   void (*ping)(E_Desktop_Surface_Interface *iface);
    void (*map)(E_Desktop_Surface_Interface *iface);
    void (*unmap)(E_Desktop_Surface_Interface *iface);
 };

diff --git a/src/bin/server/e_desktop_wl_shell.c b/src/bin/server/e_desktop_wl_shell.c
index 01c90bf840fceab68c444a7dcc76ccb0f8e59d12..46c2f921b72974b3bd3069f5bdef368851c17f20 100644 (file)
--- a/src/bin/server/e_desktop_wl_shell.c
+++ b/src/bin/server/e_desktop_wl_shell.c
@@ -52,30 +52,6 @@ _surface_configure(struct wl_resource *resource, Evas_Coord x, Evas_Coord y, Eva
    e_client_util_move_resize_without_frame(ec, x, y, w, h);
 }
 
-static void
-_surface_ping(struct wl_resource *resource)
-{
-   E_Client *ec;
-   uint32_t serial;
-   E_Comp_Wl_Data *comp_wl;
-
-   if (!resource)
-     return;
-
-   /* get the client for this resource */
-   if (!(ec = wl_resource_get_user_data(resource)))
-     {
-        wl_resource_post_error(resource,
-                               WL_DISPLAY_ERROR_INVALID_OBJECT,
-                               "No Client For Shell Surface");
-        return;
-     }
-
-   comp_wl = e_comp_wl_get();
-   serial = wl_display_next_serial(comp_wl->wl.disp);
-   wl_shell_surface_send_ping(ec->comp_data->shell.surface, serial);
-}
-
 static void
 _surface_map(struct wl_resource *resource)
 {
@@ -136,10 +112,6 @@ _surface_unmap(struct wl_resource *resource)
 static void
 _surface_cb_pong(struct wl_client *client EINA_UNUSED, struct wl_resource *resource, uint32_t serial EINA_UNUSED)
 {
-   E_Client *ec;
-
-   if ((ec = wl_resource_get_user_data(resource)))
-     e_shell_e_client_pong(ec);
 }
 
 static void
@@ -386,7 +358,7 @@ _shell_cb_shell_surface_get(struct wl_client *client, struct wl_resource *resour
    E_Shell_Surface_Api api = {
         .configure_send = _surface_configure_send,
         .configure = _surface_configure,
-        .ping = _surface_ping,
+        .ping = NULL,
         .map = _surface_map,
         .unmap = _surface_unmap,
    };

diff --git a/src/bin/server/e_desktop_xdg_shell_v5.c b/src/bin/server/e_desktop_xdg_shell_v5.c
index f759e0f84ced89af5e4a9001f57e7b714b511744..12e927311bf5aef8a8e056f6780dd76a4bb477cc 100644 (file)
--- a/src/bin/server/e_desktop_xdg_shell_v5.c
+++ b/src/bin/server/e_desktop_xdg_shell_v5.c
@@ -14,7 +14,6 @@ struct _E_Xdg_Shell_V5
 {
    struct wl_client   *wc;
    struct wl_resource *res;      /* xdg_shell resource */
-   Eina_List          *ping_ecs; /* list of all ec which are waiting for pong response */
 };
 
 static Eina_Hash *xdg_sh_hash = NULL;
@@ -161,39 +160,6 @@ _surface_map(struct wl_resource *resource)
    TRACE_DS_END();
 }
 
-static void
-_surface_ping(struct wl_resource *resource)
-{
-   E_Client *ec;
-   uint32_t serial;
-   struct wl_client *client;
-   E_Xdg_Shell_V5 *esh;
-
-   if (!resource)
-     return;
-
-   /* get the client for this resource */
-   if (!(ec = wl_resource_get_user_data(resource)))
-     {
-        wl_resource_post_error(resource,
-                               WL_DISPLAY_ERROR_INVALID_OBJECT,
-                               "No Client For Shell Surface");
-        return;
-     }
-
-   client = wl_resource_get_client(resource);
-
-   esh = eina_hash_find(xdg_sh_hash, &client);
-   EINA_SAFETY_ON_NULL_RETURN(esh);
-   EINA_SAFETY_ON_NULL_RETURN(esh->res);
-
-   if (!eina_list_data_find(esh->ping_ecs, ec))
-     esh->ping_ecs = eina_list_append(esh->ping_ecs, ec);
-
-   serial = wl_display_next_serial(e_comp_wl_display_get());
-   xdg_shell_send_ping(esh->res, serial);
-}
-
 static void
 _surface_unmap(struct wl_resource *resource)
 {
@@ -504,7 +470,7 @@ _shell_cb_surface_get(struct wl_client *client, struct wl_resource *resource EIN
    E_Shell_Surface_Api api = {
         .configure_send = _surface_configure_send,
         .configure = _surface_configure,
-        .ping = _surface_ping,
+        .ping = NULL,
         .map = _surface_map,
         .unmap = _surface_unmap,
    };
@@ -567,7 +533,7 @@ _shell_cb_popup_get(struct wl_client *client, struct wl_resource *resource EINA_
    E_Shell_Surface_Api api = {
         .configure_send = _surface_configure_send,
         .configure = _surface_configure,
-        .ping = _surface_ping,
+        .ping = NULL,
         .map = _surface_map,
         .unmap = _surface_unmap,
    };
@@ -635,16 +601,6 @@ _shell_cb_popup_get(struct wl_client *client, struct wl_resource *resource EINA_
 static void
 _shell_cb_pong(struct wl_client *client, struct wl_resource *resource, uint32_t serial EINA_UNUSED)
 {
-   E_Client *ec;
-   E_Xdg_Shell_V5 *esh;
-
-   esh = eina_hash_find(xdg_sh_hash, &client);
-   EINA_SAFETY_ON_NULL_RETURN(esh);
-   EINA_SAFETY_ON_NULL_RETURN(esh->res);
-   EINA_SAFETY_ON_FALSE_RETURN(esh->res == resource);
-
-   EINA_LIST_FREE(esh->ping_ecs, ec)
-      e_shell_e_client_pong(ec);
 }
 
 static const struct xdg_shell_interface _shell_impl =
@@ -660,7 +616,6 @@ static void
 _shell_cb_unbind(struct wl_resource *resource)
 {
    E_Xdg_Shell_V5 *esh;
-   E_Client *ec;
    struct wl_client *client;
 
    client = wl_resource_get_client(resource);
@@ -669,9 +624,6 @@ _shell_cb_unbind(struct wl_resource *resource)
    esh = eina_hash_find(xdg_sh_hash, &client);
    EINA_SAFETY_ON_NULL_RETURN(esh);
 
-   EINA_LIST_FREE(esh->ping_ecs, ec)
-      e_shell_e_client_pong(ec);
-
    eina_hash_del_by_key(xdg_sh_hash, &client);
 
    E_FREE(esh);

diff --git a/src/bin/server/e_desktop_xdg_shell_v6.c b/src/bin/server/e_desktop_xdg_shell_v6.c
index 48189bb962189113e1e53e8700f538feb75215a1..2d8eed7bdc47139414692178e4168e6e57c838c9 100644 (file)
--- a/src/bin/server/e_desktop_xdg_shell_v6.c
+++ b/src/bin/server/e_desktop_xdg_shell_v6.c
@@ -39,7 +39,6 @@ struct _E_Desktop_Xdg_Toplevel_V6
    struct wl_listener request_minimize;
    struct wl_listener destroy;
    struct wl_listener configure;
-   struct wl_listener ping_timeout;
    struct wl_listener surface_commit;
 };
 
@@ -220,16 +219,6 @@ _toplevel_configure_send(E_Desktop_Surface_Interface *iface, uint32_t edges, int
    _toplevel_activated_send(toplevel);
 }
 
-static void
-_toplevel_ping(E_Desktop_Surface_Interface *iface)
-{
-   E_Desktop_Xdg_Toplevel_V6 *toplevel = wl_container_of(iface, toplevel, impl);
-
-   LOG("toplevel_v6(%p) Ping", toplevel);
-
-   ds_xdg_surface_v6_ping(toplevel->ds_toplevel->base);
-}
-
 static void
 _toplevel_client_parent_update(E_Desktop_Xdg_Toplevel_V6 *toplevel)
 {
@@ -426,12 +415,6 @@ _toplevel_cb_xdg_surface_configure(struct wl_listener *listener, void *data)
    _toplevel_oldest_configure_remove(toplevel);
 }
 
-static void
-_toplevel_cb_ping_timeout(struct wl_listener *listener, void *data)
-{
-   // This is intentionally left blank.
-}
-
 static void
 _toplevel_cb_surface_commit(struct wl_listener *listener, void *data)
 {
@@ -469,8 +452,6 @@ _toplevel_listener_init(E_Desktop_Xdg_Toplevel_V6 *toplevel)
    ds_xdg_surface_v6_add_destroy_listener(ds_xdg_surface, &toplevel->destroy);
    toplevel->configure.notify = _toplevel_cb_xdg_surface_configure;
    ds_xdg_surface_v6_add_configure_listener(ds_xdg_surface, &toplevel->configure);
-   toplevel->ping_timeout.notify = _toplevel_cb_ping_timeout;
-   ds_xdg_surface_v6_add_ping_timeout_listener(ds_xdg_surface, &toplevel->ping_timeout);
    toplevel->surface_commit.notify = _toplevel_cb_surface_commit;
    ds_surface_add_commit_listener(ds_surface, &toplevel->surface_commit);
 }
@@ -488,7 +469,6 @@ _toplevel_listener_finish(E_Desktop_Xdg_Toplevel_V6 *toplevel)
    wl_list_remove(&toplevel->request_minimize.link);
    wl_list_remove(&toplevel->destroy.link);
    wl_list_remove(&toplevel->configure.link);
-   wl_list_remove(&toplevel->ping_timeout.link);
    wl_list_remove(&toplevel->surface_commit.link);
 }
 
@@ -511,7 +491,6 @@ static void
 _toplevel_desktop_surface_interface_init(E_Desktop_Surface_Interface *iface)
 {
    iface->configure_send = _toplevel_configure_send;
-   iface->ping = _toplevel_ping;
    iface->configure = NULL;
    iface->map = NULL;
    iface->unmap = NULL;

diff --git a/src/bin/windowmgr/e_policy_desk_area.c b/src/bin/windowmgr/e_policy_desk_area.c
index 8bd228815dd1aff5c49347fd3aa654bf8eda8cc1..ddf0103cbdc24f38f9549a081d4ec7489187ff6c 100644 (file)
--- a/src/bin/windowmgr/e_policy_desk_area.c
+++ b/src/bin/windowmgr/e_policy_desk_area.c
@@ -73,7 +73,6 @@ struct _E_Policy_Desk_Area_Private_Client
    struct wl_listener client_resize_end;
    struct wl_listener delete_request;
    struct wl_listener kill_request;
-   struct wl_listener ping;
    struct wl_listener redirect;
 
    // comp_object listeners
@@ -1594,22 +1593,6 @@ _desk_area_cb_client_kill_request(struct wl_listener *listener, void *data)
    e_comp_wl_focus_check();
 }
 
-static void
-_desk_area_cb_client_ping(struct wl_listener *listener, void *data)
-{
-   E_Policy_Desk_Area_Private_Client *eda_client;
-   E_Desk_Area *eda;
-   E_Client *ec;
-
-   eda_client = wl_container_of(listener, eda_client, ping);
-   eda = eda_client->eda;
-   ec = eda_client->ec;
-
-   ELOGF("EDA", "CLIENT PING. eda:%p", ec, eda);
-
-   e_client_shell_ping(ec);
-}
-
 static void
 _desk_area_cb_client_redirect(struct wl_listener *listener, void *data)
 {
@@ -2803,8 +2786,6 @@ _e_policy_desk_area_private_client_del(E_Policy_Desk_Area_Private_Client *eda_cl
      wl_list_remove(&eda_client->comp_object_resize.link);
    if (eda_client->redirect.notify)
      wl_list_remove(&eda_client->redirect.link);
-   if (eda_client->ping.notify)
-     wl_list_remove(&eda_client->ping.link);
    if (eda_client->kill_request.notify)
      wl_list_remove(&eda_client->kill_request.link);
    if (eda_client->delete_request.notify)
@@ -2914,8 +2895,6 @@ _e_policy_desk_area_cb_client_add(struct wl_listener *listener, void *data)
      {
         eda_client->redirect.notify = _desk_area_cb_client_redirect;
         e_client_redirect_listener_add(ec, &eda_client->redirect);
-        eda_client->ping.notify = _desk_area_cb_client_ping;
-        e_client_ping_listener_add(ec, &eda_client->ping);
         eda_client->kill_request.notify = _desk_area_cb_client_kill_request;
         e_client_kill_request_listener_add(ec, &eda_client->kill_request);
         eda_client->comp_object_resize.notify = _desk_area_cb_comp_object_resize;

diff --git a/src/include/e_client.h b/src/include/e_client.h
index 68ca7741139b89c6fcd906657463b3c2b20f9c91..b249a87ab9d4856d5b05b7b4d502d3c95905f597 100644 (file)
--- a/src/include/e_client.h
+++ b/src/include/e_client.h
@@ -371,7 +371,7 @@ struct _E_Client
    E_Zone *zone;
    E_Desk *desk;
 
-   Ecore_Poller              *ping_poller;
+   E_DEPRECATED Ecore_Poller              *ping_poller;
    Ecore_Timer               *kill_timer;
 
    E_Client                  *parent;
@@ -472,7 +472,7 @@ struct _E_Client
 
       unsigned char opacity;
       Eina_Bool     opacity_changed : 1; // prevent fetching opacity next prop change
-      unsigned char ping : 1;
+      E_DEPRECATED unsigned char ping : 1;
 
       /* NetWM Window state */
       struct
@@ -616,8 +616,8 @@ struct _E_Client
    unsigned int       skip_fullscreen : 1;
    unsigned int       need_reparent : 1;
    unsigned int       delete_requested : 1;
-   unsigned int       ping_ok : 1;
-   unsigned int       hung : 1;
+   E_DEPRECATED unsigned int       ping_ok : 1;
+   E_DEPRECATED unsigned int       hung : 1;
    unsigned int       take_focus : 1;
    unsigned int       want_focus : 1;
    unsigned int       user_skip_winlist : 1;
@@ -652,7 +652,7 @@ struct _E_Client
    unsigned int       internal : 1;
    E_DEPRECATED Eina_Bool          dead : 1;
 
-   double             ping;
+   E_DEPRECATED double             ping;
 
    unsigned char      changed : 1;
 
@@ -1230,8 +1230,8 @@ E_API void          e_client_netwm_state_skip_pager_set(E_Client *ec, Eina_Bool
 E_API void          e_client_netwm_state_skip_taskbar_set(E_Client *ec, Eina_Bool set);
 
 E_API E_Client *e_client_parent_get(E_Client *ec);
-E_API void      e_client_ping_return_set(E_Client *ec, Eina_Bool set);
-E_API Eina_Bool e_client_ping_return_get(E_Client *ec);
+E_DEPRECATED E_API void      e_client_ping_return_set(E_Client *ec, Eina_Bool set);
+E_DEPRECATED E_API Eina_Bool e_client_ping_return_get(E_Client *ec);
 E_API E_Pixmap *e_client_pixmap_get(E_Client *ec);
 
 E_API void      e_client_post_lower_set(E_Client *ec, Eina_Bool set);

diff --git a/src/include/e_comp_wl.h b/src/include/e_comp_wl.h
index 94aa43e5fcb79bed2a14c058b409393494a31a35..3a1db1344fd79302d3c82451be60ba3cf1848401 100644 (file)
--- a/src/include/e_comp_wl.h
+++ b/src/include/e_comp_wl.h
@@ -171,7 +171,7 @@ struct _E_Comp_Wl_Shell_Surface_Api
 {
    void (*configure_send)(struct wl_resource *resource, uint32_t edges, int32_t width, int32_t height);
    void (*configure)(struct wl_resource *resource, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-   void (*ping)(struct wl_resource *resource);
+   E_DEPRECATED void (*ping)(struct wl_resource *resource);
    void (*map)(struct wl_resource *resource);
    void (*unmap)(struct wl_resource *resource);
 };
@@ -413,7 +413,7 @@ struct _E_Comp_Wl_Client_Data
 
         void (*configure_send)(struct wl_resource *resource, uint32_t edges, int32_t width, int32_t height);
         void (*configure)(struct wl_resource *resource, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-        void (*ping)(struct wl_resource *resource);
+        E_DEPRECATED void (*ping)(struct wl_resource *resource);
         void (*map)(struct wl_resource *resource);
         void (*unmap)(struct wl_resource *resource);
         Eina_Rectangle window;

diff --git a/src/include/e_config.h b/src/include/e_config.h
index e3952b4f164a45764d2751a5ca206cfa2a019049..55d38145952ccd94c3ff2f4c10e7e8691e80102b 100644 (file)
--- a/src/include/e_config.h
+++ b/src/include/e_config.h
@@ -62,7 +62,7 @@ struct _E_Config
    int         kill_if_close_not_possible;
    int         kill_process;
    double      kill_timer_wait;
-   int         ping_clients;
+   E_DEPRECATED int         ping_clients;
    int         use_e_cursor;
    int         cursor_size;
    struct
@@ -91,7 +91,7 @@ struct _E_Config
    int                       raise_on_revert_focus;
    const char               *theme_default_border_style;
    int                       screen_limits;
-   int                       ping_clients_interval;
+   E_DEPRECATED int                       ping_clients_interval;
    struct
    {
       double timeout;