e_client: remove deprecated value in E_Client

Change-Id: Ia3413fb8e806adc392f76eb1ddd863a72713bbf3

diff --git a/src/bin/compmgr/e_comp_object_intern.h b/src/bin/compmgr/e_comp_object_intern.h
index 808872571d4ffbddba34d3d20a8aaba8170fae6f..054740c9272ad786f1f125e4fdc596c8f144e69a 100644 (file)
--- a/src/bin/compmgr/e_comp_object_intern.h
+++ b/src/bin/compmgr/e_comp_object_intern.h
@@ -22,7 +22,6 @@ struct _E_Comp_Object
       double          start;
       double          val;
       int             x, y;
-      E_Direction     dir;
       Ecore_Animator *anim;
    } shade;
 

diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c
index 1d871cc3f39a0adff9103f8d551a00737e72a175..5c32abd65e205e0a92ac2f84bb5d1ac4c3068ce2 100644 (file)
--- a/src/bin/core/e_client.c
+++ b/src/bin/core/e_client.c
@@ -8564,12 +8564,6 @@ e_client_remote_surface_is_provider(E_Client *ec)
    return ec->remote_surface.provider;
 }
 
-E_API void
-e_client_no_shape_cut_set(E_Client *ec, Eina_Bool set)
-{
-   if (ec) ec->no_shape_cut = set;
-}
-
 E_API unsigned char
 e_client_shaped_get(E_Client *ec)
 {

diff --git a/src/include/e_client.h b/src/include/e_client.h
index ec55ff828cddc0ecc337f969fbe72494dd00785d..4cb862563fa253aaef595fa625f3479cfb17c6bf 100644 (file)
--- a/src/include/e_client.h
+++ b/src/include/e_client.h
@@ -24,7 +24,6 @@ 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;
-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;
@@ -45,15 +44,6 @@ typedef enum _E_Icon_Preference
    E_ICON_PREF_USER
 } E_Icon_Preference;
 
-//EINA_DEPRECATED
-typedef enum _E_Direction
-{
-   E_DIRECTION_UP,
-   E_DIRECTION_DOWN,
-   E_DIRECTION_LEFT,
-   E_DIRECTION_RIGHT
-} E_Direction;
-
 typedef enum _E_Transition
 {
    E_TRANSITION_LINEAR = 0,
@@ -67,14 +57,6 @@ typedef enum _E_Transition
    E_TRANSITION_BOUNCE_LOTS = 8
 } E_Transition;
 
-//EINA_DEPRECATED
-typedef enum _E_Stacking
-{
-   E_STACKING_NONE,
-   E_STACKING_ABOVE,
-   E_STACKING_BELOW
-} E_Stacking;
-
 typedef enum _E_Focus_Policy
 {
    E_FOCUS_CLICK,
@@ -360,13 +342,6 @@ struct _E_Client_Intercept_Hook
    unsigned char       delete_me : 1;
 };
 
-//EINA_DEPRECATED
-struct _E_Client_Pending_Resize
-{
-   int           w, h;
-   unsigned int  serial;
-};
-
 struct _E_Event_Client_Rotation_Geometry_Set
 {
    E_Client *ec;
@@ -410,11 +385,6 @@ struct _E_Client
    Eina_Rectangle           *shape_input_rects;
    unsigned int              shape_input_rects_num;
 
-   EINA_DEPRECATED Eina_Stringshare         *internal_icon;
-   EINA_DEPRECATED Eina_Stringshare         *internal_icon_key;
-
-   EINA_DEPRECATED E_Direction               shade_dir;
-
    E_Comp_Wl_Client_Data    *comp_data;
 
    E_Action                  *cur_mouse_action;
@@ -441,7 +411,6 @@ struct _E_Client
       } down;
    } moveinfo;
 
-   EINA_DEPRECATED unsigned char      ignore_first_unmap;
    E_Pointer_Mode     resize_mode;
 
    struct
@@ -482,43 +451,16 @@ struct _E_Client
 #else
       Eina_Stringshare        *class;
 #endif
-      EINA_DEPRECATED Eina_Stringshare        *icon_name;
-      EINA_DEPRECATED Eina_Stringshare        *machine;
       int                       min_w, min_h;
       int                       max_w, max_h;
-      EINA_DEPRECATED int                       base_w, base_h;
-      EINA_DEPRECATED int                       step_w, step_h;
-      EINA_DEPRECATED int                       start_x, start_y;
-      EINA_DEPRECATED double                    min_aspect, max_aspect;
-      EINA_DEPRECATED Ecore_Window            icon_window;
-      EINA_DEPRECATED Ecore_Window            window_group;
       Ecore_Window            transient_for;
-      EINA_DEPRECATED Ecore_Window            client_leader;
       Eina_Stringshare         *window_role;
       unsigned char             take_focus : 1;
       unsigned char             accepts_focus : 1;
-      EINA_DEPRECATED unsigned char             urgent : 1;
       unsigned char             delete_request : 1;
-      EINA_DEPRECATED unsigned char             request_pos : 1;
-      EINA_DEPRECATED struct
-      {
-         int    argc;
-         char **argv;
-      } command;
       struct
       {
-         EINA_DEPRECATED unsigned char title : 1;
-         EINA_DEPRECATED unsigned char name_class : 1;
-         EINA_DEPRECATED unsigned char icon_name : 1;
-         EINA_DEPRECATED unsigned char machine : 1;
-         EINA_DEPRECATED unsigned char hints : 1;
-         EINA_DEPRECATED unsigned char size_pos_hints : 1;
-         EINA_DEPRECATED unsigned char protocol : 1;
          unsigned char transient_for : 1;
-         EINA_DEPRECATED unsigned char client_leader : 1;
-         EINA_DEPRECATED unsigned char window_role : 1;
-         EINA_DEPRECATED unsigned char state : 1;
-         EINA_DEPRECATED unsigned char command : 1;
       } fetch;
    } icccm;
 
@@ -526,97 +468,22 @@ struct _E_Client
    struct
    {
       pid_t         pid;
-      EINA_DEPRECATED unsigned int  desktop;
       Eina_Stringshare *name;
-      EINA_DEPRECATED Eina_Stringshare *icon_name;
 
-      EINA_DEPRECATED Ecore_X_Icon *icons;
-
-      EINA_DEPRECATED int           num_icons;
-      EINA_DEPRECATED unsigned int  user_time;
       unsigned char opacity;
       Eina_Bool     opacity_changed : 1; // prevent fetching opacity next prop change
-      EINA_DEPRECATED struct
-      {
-         int left;
-         int right;
-         int top;
-         int bottom;
-         int left_start_y;
-         int left_end_y;
-         int right_start_y;
-         int right_end_y;
-         int top_start_x;
-         int top_end_x;
-         int bottom_start_x;
-         int bottom_end_x;
-      } strut;
       unsigned char ping : 1;
-      EINA_DEPRECATED struct
-      {
-         unsigned char        request : 1;
-         unsigned char        alarm : 1;
-         unsigned int         wait;
-         unsigned int         serial;
-         double               send_time;
-      } sync;
 
       /* NetWM Window state */
       struct
       {
          unsigned char modal : 1;
-         EINA_DEPRECATED unsigned char sticky : 1;
-         EINA_DEPRECATED unsigned char maximized_v : 1;
-         EINA_DEPRECATED unsigned char maximized_h : 1;
-         EINA_DEPRECATED unsigned char shaded : 1;
          unsigned char skip_taskbar : 1;
          unsigned char skip_pager : 1;
-         EINA_DEPRECATED unsigned char hidden : 1;
-         EINA_DEPRECATED unsigned char fullscreen : 1;
-         EINA_DEPRECATED E_Stacking    stacking;
       } state;
 
       /* NetWM Window allowed actions */
-      EINA_DEPRECATED struct
-      {
-         unsigned char move : 1;
-         unsigned char resize : 1;
-         unsigned char minimize : 1;
-         unsigned char shade : 1;
-         unsigned char stick : 1;
-         unsigned char maximized_h : 1;
-         unsigned char maximized_v : 1;
-         unsigned char fullscreen : 1;
-         unsigned char change_desktop : 1;
-         unsigned char close : 1;
-      } action;
       E_Window_Type  type;
-      EINA_DEPRECATED E_Window_Type *extra_types;
-      EINA_DEPRECATED int                  extra_types_num;
-      EINA_DEPRECATED int                  startup_id;
-
-      EINA_DEPRECATED struct
-      {
-         unsigned char name : 1;
-         unsigned char icon_name : 1;
-         unsigned char icon : 1;
-         unsigned char user_time : 1;
-         unsigned char strut : 1;
-         unsigned char type : 1;
-         unsigned char state : 1;
-         unsigned char opacity : 1;
-         /* No, fetch on new_client, shouldn't be changed after map.
-            unsigned char pid : 1;
-          */
-         /* No, ignore this
-            unsigned char desktop : 1;
-          */
-      } fetch;
-
-      EINA_DEPRECATED struct
-      {
-         unsigned char state : 1;
-      } update;
    } netwm;
 
    /* Extra e stuff */
@@ -744,16 +611,10 @@ struct _E_Client
    unsigned int       iconic : 1;
    unsigned int       deskshow : 1;
    unsigned int       sticky : 1;
-   EINA_DEPRECATED unsigned int       urgent : 1;
-   EINA_DEPRECATED unsigned int       shaped_input : 1;
-   EINA_DEPRECATED unsigned int       need_shape_merge : 1;
-   EINA_DEPRECATED unsigned int       need_shape_export : 1;
    unsigned int       fullscreen : 1;
    unsigned int       need_fullscreen : 1;
    unsigned int       skip_fullscreen : 1;
-   EINA_DEPRECATED unsigned int       already_unparented : 1;
    unsigned int       need_reparent : 1;
-   EINA_DEPRECATED unsigned int       button_grabbed : 1;
    unsigned int       delete_requested : 1;
    unsigned int       ping_ok : 1;
    unsigned int       hung : 1;
@@ -765,7 +626,6 @@ struct _E_Client
    E_Layer            fullscreen_layer;
    E_Transient        transient_policy;
    unsigned int       borderless : 1;
-   EINA_DEPRECATED unsigned char      offer_resistance : 1;
    Eina_Stringshare  *bordername;
 
    unsigned int       lock_user_location : 1; /*DONE*/
@@ -796,27 +656,19 @@ struct _E_Client
 
    unsigned char      changed : 1;
 
-   EINA_DEPRECATED Eina_List       *pending_resize;
-
    E_Client_Move_Intercept_Cb move_intercept_cb;
 
    unsigned char              comp_hidden   : 1;
 
-   EINA_DEPRECATED unsigned char              during_lost : 1;
-
    E_Focus_Policy             focus_policy_override;
 
    Eina_Bool override : 1;
    Eina_Bool input_only : 1;
    Eina_Bool dialog : 1;
-   EINA_DEPRECATED Eina_Bool tooltip : 1;
    Eina_Bool redirected : 1;
-   EINA_DEPRECATED Eina_Bool unredirected_single : 1; //window has been selectively unredirected
-   EINA_DEPRECATED Eina_Bool shape_changed : 1;
    Eina_Bool layer_block : 1; // client is doing crazy stuff and should not be relayered in protocol
    Eina_Bool layer_pending : 1; // change inlist stack but postpone evas stack
    Eina_Bool ignored : 1; // client is comp-ignored
-   Eina_Bool no_shape_cut : 1; // EINA_DEPRECATED
    Eina_Bool maximize_override : 1; // client is doing crazy stuff and should "just do it" when moving/resizing
    Eina_Bool transformed : 1;
    Eina_Bool keyboard_resizing : 1;
@@ -907,8 +759,6 @@ struct _E_Client
       E_Indicator_Visible_Type visible_type;
    } indicator;
 
-   EINA_DEPRECATED void *renderer_client;
-
    struct
    {
       Eina_Bool provider : 1;
@@ -1005,7 +855,6 @@ struct _E_Client
 
    E_Maximize_Direction maximize_dir;
    E_Maximize_Type      maximize_type;
-   EINA_DEPRECATED Eina_Bool apply_layout;
 
    struct
    {
@@ -1384,9 +1233,6 @@ E_API Eina_Bool e_client_lock_client_size_get(E_Client *ec);
 E_API Eina_Bool e_client_remote_surface_is_consumer(E_Client *ec);
 E_API Eina_Bool e_client_remote_surface_is_provider(E_Client *ec);
 
-E_API void      e_client_no_shape_cut_set(E_Client *ec, Eina_Bool set);
-
-
 E_API unsigned char e_client_shaped_get(E_Client *ec);
 E_API int e_client_show_pending_count_get(E_Client *ec);