e_client: deprecate some values of netwm in E_Client

Change-Id: Id5561c716d908c2951d5be16c26a11c29eab685f

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index df3fb4e..0fb1321 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -972,14 +972,6 @@ _e_client_free(E_Client *ec)
    E_FREE_FUNC(ec->map_timer, ecore_timer_del);
 
    ec->transients = eina_list_free(ec->transients);
-   if (ec->netwm.icons)
-     {
-        int i;
-        for (i = 0; i < ec->netwm.num_icons; i++)
-          free(ec->netwm.icons[i].data);
-        E_FREE(ec->netwm.icons);
-     }
-   E_FREE(ec->netwm.extra_types);
    eina_stringshare_replace(&ec->border.name, NULL);
    eina_stringshare_replace(&ec->bordername, NULL);
    eina_stringshare_replace(&ec->icccm.name, NULL);
@@ -1001,7 +993,6 @@ _e_client_free(E_Client *ec)
         E_FREE(ec->icccm.command.argv);
      }
    eina_stringshare_replace(&ec->netwm.name, NULL);
-   eina_stringshare_replace(&ec->netwm.icon_name, NULL);
    eina_stringshare_replace(&ec->internal_icon, NULL);
    eina_stringshare_replace(&ec->internal_icon_key, NULL);
 
@@ -2392,8 +2383,6 @@ e_client_frame_update(E_Client *ec)
      bordername = "shaped";
    else if (ec->urgent)
      bordername = "urgent";
-   else if (ec->netwm.state.modal)
-     bordername = "modal";
    else if ((ec->netwm.state.skip_taskbar) ||
             (ec->netwm.state.skip_pager))
      bordername = "skipped";
@@ -3233,28 +3222,8 @@ e_client_new(E_Pixmap *cp, int first_map, int internal)
 
    ec->netwm.pid = 0;
    ec->netwm.name = NULL;
-   ec->netwm.icon_name = NULL;
-   ec->netwm.desktop = 0;
-   ec->netwm.state.modal = 0;
-   ec->netwm.state.sticky = 0;
-   ec->netwm.state.shaded = 0;
-   ec->netwm.state.hidden = 0;
-   ec->netwm.state.maximized_v = 0;
-   ec->netwm.state.maximized_h = 0;
    ec->netwm.state.skip_taskbar = 0;
    ec->netwm.state.skip_pager = 0;
-   ec->netwm.state.fullscreen = 0;
-   ec->netwm.state.stacking = E_STACKING_NONE;
-   ec->netwm.action.move = 0;
-   ec->netwm.action.resize = 0;
-   ec->netwm.action.minimize = 0;
-   ec->netwm.action.shade = 0;
-   ec->netwm.action.stick = 0;
-   ec->netwm.action.maximized_h = 0;
-   ec->netwm.action.maximized_v = 0;
-   ec->netwm.action.fullscreen = 0;
-   ec->netwm.action.change_desktop = 0;
-   ec->netwm.action.close = 0;
    ec->netwm.opacity = 255;
 
    ec->visibility.obscured = E_VISIBILITY_UNKNOWN;

diff --git a/src/bin/e_client.h b/src/bin/e_client.h
index 4ba7a12..c280ca0 100644 (file)
--- a/src/bin/e_client.h
+++ b/src/bin/e_client.h
@@ -34,6 +34,7 @@ typedef enum _E_Transition
    E_TRANSITION_BOUNCE_LOTS = 8
 } E_Transition;
 
+//EINA_DEPRECATED
 typedef enum _E_Stacking
 {
    E_STACKING_NONE,
@@ -509,17 +510,17 @@ struct E_Client
    struct
    {
       pid_t         pid;
-      unsigned int  desktop;
+      EINA_DEPRECATED unsigned int  desktop;
       Eina_Stringshare *name;
-      Eina_Stringshare *icon_name;
+      EINA_DEPRECATED Eina_Stringshare *icon_name;
 
-      Ecore_X_Icon *icons;
+      EINA_DEPRECATED Ecore_X_Icon *icons;
 
-      int           num_icons;
-      unsigned int  user_time;
+      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
-      struct
+      EINA_DEPRECATED struct
       {
          int left;
          int right;
@@ -535,7 +536,7 @@ struct E_Client
          int bottom_end_x;
       } strut;
       unsigned char ping : 1;
-      struct
+      EINA_DEPRECATED struct
       {
          unsigned char        request : 1;
          unsigned char        alarm : 1;
@@ -547,20 +548,20 @@ struct E_Client
       /* NetWM Window state */
       struct
       {
-         unsigned char modal : 1;
-         unsigned char sticky : 1;
-         unsigned char maximized_v : 1;
-         unsigned char maximized_h : 1;
-         unsigned char shaded : 1;
+         EINA_DEPRECATED 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;
-         unsigned char hidden : 1;
-         unsigned char fullscreen : 1;
-         E_Stacking    stacking;
+         EINA_DEPRECATED unsigned char hidden : 1;
+         EINA_DEPRECATED unsigned char fullscreen : 1;
+         EINA_DEPRECATED E_Stacking    stacking;
       } state;
 
       /* NetWM Window allowed actions */
-      struct
+      EINA_DEPRECATED struct
       {
          unsigned char move : 1;
          unsigned char resize : 1;
@@ -574,11 +575,11 @@ struct E_Client
          unsigned char close : 1;
       } action;
       E_Window_Type  type;
-      E_Window_Type *extra_types;
-      int                  extra_types_num;
-      int                  startup_id;
+      EINA_DEPRECATED E_Window_Type *extra_types;
+      EINA_DEPRECATED int                  extra_types_num;
+      EINA_DEPRECATED int                  startup_id;
 
-      struct
+      EINA_DEPRECATED struct
       {
          unsigned char name : 1;
          unsigned char icon_name : 1;
@@ -596,7 +597,7 @@ struct E_Client
           */
       } fetch;
 
-      struct
+      EINA_DEPRECATED struct
       {
          unsigned char state : 1;
       } update;

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 65e4a5b..4af04fd 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -983,12 +983,7 @@ _e_comp_object_shadow_client_match(const E_Client *ec, E_Comp_Match *m)
     }
   if (m->modal != 0)
     {
-       int modal = 0;
-
-       if (ec->netwm.state.modal)
-         modal = 1;
-       if (!(((m->modal == -1) && (!modal)) ||
-             ((m->modal == 1) && (modal))))
+       if (!(m->modal == -1))
          return EINA_FALSE;
     }
   return EINA_TRUE;