e_client: deprecate some values of E_Client

Change-Id: I5855b9b53f14f7c511129bee0c1b0927a465bc35

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 73820cf..87a2747 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -2144,7 +2144,6 @@ _e_client_cb_evas_restack(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA
 
           }
      }
-   if (ec->unredirected_single) return;
    _e_client_event_simple(ec, E_EVENT_CLIENT_STACK);
 
    e_comp_visibility_calculation_set(EINA_TRUE);
@@ -3157,7 +3156,6 @@ e_client_new(E_Pixmap *cp, int first_map, int internal)
         ec->changes.pos = 1;
         ec->re_manage = 1;
      }
-   ec->offer_resistance = 1;
    ec->new_client = 1;
    e_comp->new_clients++;
 

diff --git a/src/bin/e_client.h b/src/bin/e_client.h
index 379d515..cec7f90 100644 (file)
--- a/src/bin/e_client.h
+++ b/src/bin/e_client.h
@@ -13,6 +13,7 @@ typedef enum _E_Icon_Preference
    E_ICON_PREF_USER
 } E_Icon_Preference;
 
+//EINA_DEPRECATED
 typedef enum _E_Direction
 {
    E_DIRECTION_UP,
@@ -394,10 +395,10 @@ struct E_Client
    Eina_Rectangle           *shape_input_rects;
    unsigned int              shape_input_rects_num;
 
-   Eina_Stringshare         *internal_icon;
-   Eina_Stringshare         *internal_icon_key;
+   EINA_DEPRECATED Eina_Stringshare         *internal_icon;
+   EINA_DEPRECATED Eina_Stringshare         *internal_icon_key;
 
-   E_Direction               shade_dir;
+   EINA_DEPRECATED E_Direction               shade_dir;
 
    E_Comp_Wl_Client_Data    *comp_data;
 
@@ -745,15 +746,15 @@ struct E_Client
    unsigned int       deskshow : 1;
    unsigned int       sticky : 1;
    EINA_DEPRECATED unsigned int       urgent : 1;
-   unsigned int       shaped_input : 1;
-   unsigned int       need_shape_merge : 1;
-   unsigned int       need_shape_export : 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;
-   unsigned int       already_unparented : 1;
+   EINA_DEPRECATED unsigned int       already_unparented : 1;
    unsigned int       need_reparent : 1;
-   unsigned int       button_grabbed : 1;
+   EINA_DEPRECATED unsigned int       button_grabbed : 1;
    unsigned int       delete_requested : 1;
    unsigned int       ping_ok : 1;
    unsigned int       hung : 1;
@@ -765,7 +766,7 @@ struct E_Client
    E_Layer            fullscreen_layer;
    E_Transient        transient_policy;
    unsigned int       borderless : 1;
-   unsigned char      offer_resistance : 1;
+   EINA_DEPRECATED unsigned char      offer_resistance : 1;
    Eina_Stringshare  *bordername;
 
    unsigned int       lock_user_location : 1; /*DONE*/
@@ -802,21 +803,21 @@ struct E_Client
 
    unsigned char              comp_hidden   : 1;
 
-   unsigned char              during_lost : 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_Bool tooltip : 1;
+   EINA_DEPRECATED Eina_Bool tooltip : 1;
    Eina_Bool redirected : 1;
-   Eina_Bool unredirected_single : 1; //window has been selectively unredirected
-   Eina_Bool shape_changed : 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; // client shape should not be cut
+   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;
@@ -1427,7 +1428,6 @@ e_client_util_shadow_state_get(const E_Client *ec)
 {
    Eina_Bool on;
    if (!ec) return EINA_FALSE;
-   if (ec->shaped) return EINA_FALSE;
    if (ec->argb)
      {
         return (!ec->borderless) && (ec->bordername || (ec->border.name && strcmp(ec->border.name, "borderless")));

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index e76afa0..5d239ce 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -1429,12 +1429,11 @@ _e_comp_object_pixels_get(void *data, Evas_Object *obj EINA_UNUSED)
    else if (e_comp_object_render(ec->frame))
      {
         /* apply shape mask if necessary */
-        if ((!cw->native) && (ec->shaped || ec->shape_changed))
+        if ((!cw->native) && (ec->shaped))
           e_comp_object_shape_apply(ec->frame);
-        ec->shape_changed = 0;
      }
    /* shaped clients get precise mouse events to handle transparent pixels */
-   evas_object_precise_is_inside_set(cw->obj, ec->shaped || ec->shaped_input);
+   evas_object_precise_is_inside_set(cw->obj, ec->shaped);
 
    /* queue another render if client is still dirty; cannot refresh here. */
    if (e_pixmap_dirty_get(ec->pixmap) && e_pixmap_size_get(ec->pixmap, &pw, &ph))
@@ -1750,9 +1749,7 @@ _e_comp_intercept_resize(void *data, Evas_Object *obj, int w, int h)
    if (!cw->ec->override)
      {
         /* shape probably changed for non-overrides */
-        cw->ec->need_shape_merge |= cw->ec->shaped || cw->ec->shaped_input;
-        cw->ec->need_shape_export |= cw->ec->shaped;
-        if (cw->ec->shaped || cw->ec->shaped_input)
+        if (cw->ec->shaped)
           EC_CHANGED(cw->ec);
      }
 

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index e3e644a..7b2e575 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -6179,7 +6179,6 @@ _e_comp_wl_client_subsurface_set(E_Client *ec, E_Comp_Wl_Subsurf_Data *sub)
    ec->lock_focus_in = ec->lock_focus_out = EINA_TRUE;
    ec->netwm.state.skip_taskbar = EINA_TRUE;
    ec->netwm.state.skip_pager = EINA_TRUE;
-   ec->no_shape_cut = EINA_TRUE;
    ec->border_size = 0;
    ec->lock_user_location = 0;
    ec->lock_client_location = 0;

diff --git a/src/bin/e_compositor.c b/src/bin/e_compositor.c
index c9dc749..f1431c0 100644 (file)
--- a/src/bin/e_compositor.c
+++ b/src/bin/e_compositor.c
@@ -437,7 +437,6 @@ _e_compositor_cb_new_client(void *data EINA_UNUSED, E_Client *ec)
    /* set initial client properties */
    ec->argb = EINA_FALSE;
    ELOGF("COMP", "Set argb:%d", ec, ec->argb);
-   ec->no_shape_cut = EINA_TRUE;
    ec->redirected = ec->ignored = 1;
    ec->border_size = 0;
 
@@ -1031,8 +1030,6 @@ _e_surface_cb_client_del(void *data, E_Client *ec)
 
    e_comp_wl_hook_call(E_COMP_WL_HOOK_DEL, ec);
 
-   ec->already_unparented = EINA_TRUE;
-
    e_comp_wl_client_evas_deinit(ec);
 
    e_pixmap_cdata_set(ec->pixmap, NULL);

diff --git a/src/bin/e_foreign_shell.c b/src/bin/e_foreign_shell.c
index c851031..8fa5ba7 100644 (file)
--- a/src/bin/e_foreign_shell.c
+++ b/src/bin/e_foreign_shell.c
@@ -822,7 +822,6 @@ _e_foreign_shell_ec_link(E_Foreign_Shell *fs, E_Client *ec)
    ec->lock_focus_in = ec->lock_focus_out = EINA_TRUE;
    ec->netwm.state.skip_taskbar = EINA_TRUE;
    ec->netwm.state.skip_pager = EINA_TRUE;
-   ec->no_shape_cut = EINA_TRUE;
    ec->border_size = 0;
    ec->lock_user_location = 0;
    ec->lock_client_location = 0;

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index 9ada754..8b50e4a 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -1447,15 +1447,6 @@ _get_win_prop_Maximize_override(const Evas_Object *evas_obj)
 }
 
 static const char*
-_get_win_prop_No_shape_cut(const Evas_Object *evas_obj)
-{
-   const E_Client *ec = evas_object_data_get(evas_obj, "E_Client");
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-
-   return ec->no_shape_cut ? strdup("TRUE") : strdup("FALSE");
-}
-
-static const char*
 _set_win_prop_Ignored(Evas_Object *evas_obj, const char *prop_value)
 {
    E_Client *ec = evas_object_data_get(evas_obj, "E_Client");
@@ -1495,24 +1486,6 @@ _get_win_prop_Layer_block(const Evas_Object *evas_obj)
 }
 
 static const char*
-_get_win_prop_Shape_changed(const Evas_Object *evas_obj)
-{
-   const E_Client *ec = evas_object_data_get(evas_obj, "E_Client");
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-
-   return ec->shape_changed ? strdup("TRUE") : strdup("FALSE");
-}
-
-static const char*
-_get_win_prop_Unredirected_single(const Evas_Object *evas_obj)
-{
-   const E_Client *ec = evas_object_data_get(evas_obj, "E_Client");
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-
-   return ec->unredirected_single ? strdup("TRUE") : strdup("FALSE");
-}
-
-static const char*
 _set_win_prop_Redirected(Evas_Object *evas_obj, const char *prop_value)
 {
    E_Client *ec = evas_object_data_get(evas_obj, "E_Client");
@@ -1537,15 +1510,6 @@ _get_win_prop_Redirected(const Evas_Object *evas_obj)
 }
 
 static const char*
-_get_win_prop_Tooltip(const Evas_Object *evas_obj)
-{
-   const E_Client *ec = evas_object_data_get(evas_obj, "E_Client");
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
-
-   return ec->tooltip ? strdup("TRUE") : strdup("FALSE");
-}
-
-static const char*
 _get_win_prop_Dialog(const Evas_Object *evas_obj)
 {
    const E_Client *ec = evas_object_data_get(evas_obj, "E_Client");
@@ -2358,26 +2322,11 @@ static struct property_manager
         NULL
     },
     {
-        "Tooltip",
-        _get_win_prop_Tooltip,
-        NULL
-    },
-    {
         "Redirected",
         _get_win_prop_Redirected,
         _set_win_prop_Redirected
     },
     {
-        "Unredirected_single",
-        _get_win_prop_Unredirected_single,
-        NULL
-    },
-    {
-        "Shape_changed",
-        _get_win_prop_Shape_changed,
-        NULL
-    },
-    {
         "Layer_block",
         _get_win_prop_Layer_block,
         NULL
@@ -2388,11 +2337,6 @@ static struct property_manager
         _set_win_prop_Ignored
     },
     {
-        "No_shape_cut",
-        _get_win_prop_No_shape_cut,
-        NULL
-    },
-    {
         "Maximize_override",
         _get_win_prop_Maximize_override,
         NULL