refactor: replace code to use E_APIs to access the E_Client structure

Change-Id: I8754fc9a62205a510203d6d91c1ea94cb2673164

diff --git a/src/e_mod_processmgr.c b/src/e_mod_processmgr.c
index 360ca2db994caa5073ecc9df19c57dd5ab25afec..c375092d914b872477279a3b3f7cd22d213c6600 100644 (file)
--- a/src/e_mod_processmgr.c
+++ b/src/e_mod_processmgr.c
@@ -98,7 +98,7 @@ _e_processmgr_process_is_focused(int pid)
    focused_ec = e_client_focused_get();
    if (!focused_ec) return 0;
 
-   if (focused_ec->netwm.pid == pid)
+   if (e_client_netwm_pid_get(focused_ec) == pid)
      return 1;
    else
      return 0;
@@ -140,7 +140,7 @@ _process_id_get(E_Client *ec)
 
    if (!ec) return pid;
 
-   pid = ec->netwm.pid;
+   pid = e_client_netwm_pid_get(ec);
    if (pid <= 0)
      {
         struct wl_resource *surface;
@@ -193,42 +193,43 @@ _msg_window_info_append(Eldbus_Message_Iter *iter, int ver)
         if (e_client_util_ignored_get(ec)) continue;
 
         // get resource id
-        if (ec->pixmap)
-          res_id = e_pixmap_res_id_get(ec->pixmap);
+        if (e_client_pixmap_get(ec))
+          res_id = e_pixmap_res_id_get(e_client_pixmap_get(ec));
 
         // get geometry
         e_client_geometry_get(ec, &x, &y, &w, &h);
 
         // color depth
-        is_alpha = ec->argb;
+        is_alpha = e_client_argb_get(ec);
 
         // current angle
-        win_angle = ec->e.state.rot.ang.curr;
+        win_angle = e_client_e_state_rot_angle_current_get(ec);
 
         // zone angle
-        zone_angle = ec->zone ? ec->zone->rot.curr : 0;
+        zone = e_comp_zone_find_by_ec(ec);
+        zone_angle = zone ? e_zone_rotation_curr_angle_get(zone) : 0;
 
         // visibility
-        visibility = ec->visibility.obscured;
+        visibility = e_client_visibility_obscured_get(ec);
 
         // focused
-        focused = ec->focused;
+        focused = e_client_is_focused(ec);
 
         // get pid
         pid = _process_id_get(ec);
 
-        p_ec = ec->parent;
+        p_ec = e_client_parent_get(ec);
         if (p_ec)
           {
              // get parent pid
              p_pid = _process_id_get(p_ec);
              a_ec = p_ec;
 
-             p_ec = p_ec->parent;
+             p_ec = e_client_parent_get(p_ec);
              while (p_ec)
                {
                   a_ec = p_ec;
-                  p_ec = p_ec->parent;
+                  p_ec = e_client_parent_get(p_ec);
                }
 
              // get ancestor pid
@@ -236,11 +237,12 @@ _msg_window_info_append(Eldbus_Message_Iter *iter, int ver)
           }
 
         // notification level info
-        if (ec->layer < E_LAYER_CLIENT_NOTIFICATION_LOW)
+        E_Layer ec_layer = e_client_priv_layer_get(ec);
+        if (ec_layer < E_LAYER_CLIENT_NOTIFICATION_LOW)
           noti_level = 0;
         else
           {
-             switch (ec->layer)
+             switch (ec_layer)
                {
                 case E_LAYER_CLIENT_NOTIFICATION_LOW:
                    noti_level = 10;
@@ -260,7 +262,7 @@ _msg_window_info_append(Eldbus_Message_Iter *iter, int ver)
                }
           }
 
-        if (ec->argb && (ec->visibility.opaque <= 0))
+        if (e_client_argb_get(ec) && (e_client_visibility_alpha_opaque_get(ec) <= 0))
           is_opaque = EINA_FALSE;
         else
           is_opaque = EINA_TRUE;
@@ -276,7 +278,7 @@ _msg_window_info_append(Eldbus_Message_Iter *iter, int ver)
              // pid, geo(x,y,w,h), is_transformed, alpha, opaque, visibility, focused, is_mapped, layer, name
              eldbus_message_iter_arguments_append
                 (struct_of_win, VALUE_TYPE_FOR_VISIBLE_WINS_V2,
-                 pid, x, y, w, h, is_transformed, is_alpha, is_opaque, visibility, focused, is_mapped, ec->layer, e_client_util_name_get(ec) ?: "NO NAME");
+                 pid, x, y, w, h, is_transformed, is_alpha, is_opaque, visibility, focused, is_mapped, e_client_priv_layer_get(ec), e_client_util_name_get(ec) ?: "NO NAME");
           }
         else if (ver == 3)
           {
@@ -285,7 +287,7 @@ _msg_window_info_append(Eldbus_Message_Iter *iter, int ver)
              // pid, geo(x,y,w,h), win angle, target angle, is_transformed, alpha, opaque, visibility, focused, is_mapped, layer, name
              eldbus_message_iter_arguments_append
                 (struct_of_win, VALUE_TYPE_FOR_VISIBLE_WINS_V3,
-                 pid, x, y, w, h, win_angle, zone_angle, is_transformed, is_alpha, is_opaque, visibility, focused, is_mapped, ec->layer, e_client_util_name_get(ec) ?: "NO NAME");
+                 pid, x, y, w, h, win_angle, zone_angle, is_transformed, is_alpha, is_opaque, visibility, focused, is_mapped, e_client_priv_layer_get(ec), e_client_util_name_get(ec) ?: "NO NAME");
           }
         else
           {
@@ -402,7 +404,7 @@ _e_processmgr_cb_client_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *
    if (!ev) return ECORE_CALLBACK_PASS_ON;
 
    ec = ev->ec;
-   e_comp_object_signal_callback_add(ec->frame,
+   e_comp_object_signal_callback_add(e_client_frame_get(ec),
                                      "e,action,launch_real,done",
                                      "e",
                                      _e_processmgr_cb_launch_done,
@@ -421,7 +423,7 @@ _e_processmgr_cb_client_remove(void *data EINA_UNUSED, int type EINA_UNUSED, voi
    if (!ev) return ECORE_CALLBACK_PASS_ON;
 
    ec = ev->ec;
-   e_comp_object_signal_callback_del_full(ec->frame,
+   e_comp_object_signal_callback_del_full(e_client_frame_get(ec),
                                           "e,action,launch_real,done",
                                           "e",
                                           _e_processmgr_cb_launch_done,
@@ -433,13 +435,13 @@ _e_processmgr_cb_client_remove(void *data EINA_UNUSED, int type EINA_UNUSED, voi
 static void
 _e_processmgr_cb_client_reuse(void *data EINA_UNUSED, E_Client *ec)
 {
-   e_comp_object_signal_callback_del_full(ec->frame,
+   e_comp_object_signal_callback_del_full(e_client_frame_get(ec),
                                           "e,action,launch_real,done",
                                           "e",
                                           _e_processmgr_cb_launch_done,
                                           ec);
 
-   e_comp_object_signal_callback_add(ec->frame,
+   e_comp_object_signal_callback_add(e_client_frame_get(ec),
                                      "e,action,launch_real,done",
                                      "e",
                                      _e_processmgr_cb_launch_done,