deprecate the pending_resize in E_Client and the E_Client_Pending_Resize

Change-Id: I3ef8ed05901d61b058da701e592f61cb17246ba8

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index b11ffa6..df3fb4e 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -968,7 +968,6 @@ _e_client_free(E_Client *ec)
           tmp->e.state.video_parent_client = NULL;
      }
    E_FREE_FUNC(ec->kill_timer, ecore_timer_del);
-   E_FREE_LIST(ec->pending_resize, free);
 
    E_FREE_FUNC(ec->map_timer, ecore_timer_del);
 

diff --git a/src/bin/e_client.h b/src/bin/e_client.h
index 8d4e498..7bd1f28 100644 (file)
--- a/src/bin/e_client.h
+++ b/src/bin/e_client.h
@@ -229,7 +229,7 @@ typedef struct E_Event_Client E_Event_Client;
 typedef struct _E_Event_Client_Property E_Event_Client_Property;
 typedef struct _E_Event_Client_Focus_Skip E_Event_Client_Focus_Skip_Set;
 typedef struct _E_Event_Client_Focus_Skip E_Event_Client_Focus_Skip_Unset;
-typedef struct _E_Client_Pending_Resize E_Client_Pending_Resize;
+EINA_DEPRECATED typedef struct _E_Client_Pending_Resize E_Client_Pending_Resize;
 typedef struct _E_Client_Pending_Geometry E_Client_Pending_Geometry;
 typedef struct E_Event_Client_Zone_Set E_Event_Client_Zone_Set;
 typedef struct E_Event_Client_Desk_Set E_Event_Client_Desk_Set;
@@ -343,6 +343,7 @@ struct _E_Client_Intercept_Hook
    unsigned char       delete_me : 1;
 };
 
+//EINA_DEPRECATED
 struct _E_Client_Pending_Resize
 {
    int           w, h;
@@ -794,7 +795,7 @@ struct E_Client
 
    unsigned char      changed : 1;
 
-   Eina_List       *pending_resize;
+   EINA_DEPRECATED Eina_List       *pending_resize;
 
    E_Client_Move_Intercept_Cb move_intercept_cb;
 

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index acaf69d..65e4a5b 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -1477,22 +1477,6 @@ _e_comp_object_pixels_noti(void *data, Evas_Object *obj EINA_UNUSED)
 /////////////////////////////////////////////
 
 static void
-_e_comp_object_client_pending_resize_add(E_Client *ec,
-                                         int w,
-                                         int h,
-                                         unsigned int serial)
-{
-   E_Client_Pending_Resize *pnd;
-
-   pnd = E_NEW(E_Client_Pending_Resize, 1);
-   if (!pnd) return;
-   pnd->w = w;
-   pnd->h = h;
-   pnd->serial = serial;
-   ec->pending_resize = eina_list_append(ec->pending_resize, pnd);
-}
-
-static void
 _e_comp_intercept_move(void *data, Evas_Object *obj, int x, int y)
 {
    E_Comp_Object *cw = data;
@@ -1711,13 +1695,6 @@ _e_comp_intercept_resize(void *data, Evas_Object *obj, int w, int h)
           }
         return;
      }
-   if ((!cw->ec->internal) && e_client_util_resizing_get(cw->ec) && cw->ec->netwm.sync.request &&
-       ((cw->ec->w != w) || (cw->ec->h != h)))
-     {
-        /* this is ugly. */
-        /* netwm sync resizes queue themselves and then trigger later on */
-        _e_comp_object_client_pending_resize_add(cw->ec, iw, ih, cw->ec->netwm.sync.serial);
-     }
    if (e_client_pending_geometry_has(cw->ec))
      {
         /* do nothing while waiting paired commit serial*/

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index ef66e88..e3e644a 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -3440,15 +3440,6 @@ _e_comp_wl_client_cb_resize_end(void *data EINA_UNUSED, E_Client *ec)
 
    e_comp_wl->resize.edges = 0;
    e_comp_wl->resize.resource = NULL;
-
-   if (ec->pending_resize)
-     {
-        ec->changes.pos = EINA_TRUE;
-        ec->changes.size = EINA_TRUE;
-        EC_CHANGED(ec);
-     }
-
-   E_FREE_LIST(ec->pending_resize, free);
 }
 
 static void