e_info: add force_obscured info to topvwins and topwins

Added force_obscured info to topvwins and topwins list.
if client set force_obscured, 'f' charactor appear just beside visibility.

   [before]            [after]
--------------      --------------
Opaq Vsbt Icon      Opaq Vsbt Icon
--------------  ->  --------------
 -1    2    0        -1    2f   0
--------------      --------------

Change-Id: Ib71dac171675f166df8e4bd1f7782e832bccb352

diff --git a/src/bin/e_info_client.c b/src/bin/e_info_client.c
index 5f4649860bd81862dce0ec0736f3e10565ec2dbf..c080f5445ca3636ef2d252395be6461a97f48870 100644 (file)
--- a/src/bin/e_info_client.c
+++ b/src/bin/e_info_client.c
@@ -54,6 +54,7 @@ typedef struct _E_Win_Info
    int          alpha;      // alpha window
    int          opaque;
    int          visibility; // visibillity
+   Eina_Bool    force_obscured;
    int          iconic;
    int          frame_visible;  //ec->frame obj visible get
    int          focused;
@@ -93,7 +94,7 @@ typedef struct _E_Fps_Info
    double fps;
 } E_Fps_Info;
 
-#define VALUE_TYPE_FOR_TOPVWINS "uuisiiiiibbbiiibbiiiusbb"
+#define VALUE_TYPE_FOR_TOPVWINS "uuisiiiiibbbiibibbiiiusbb"
 #define VALUE_TYPE_REQUEST_RESLIST "ui"
 #define VALUE_TYPE_REPLY_RESLIST "ssi"
 #define VALUE_TYPE_FOR_INPUTDEV "ssi"
@@ -375,8 +376,8 @@ _e_get_windows(int mode, char *value)
 
 static E_Win_Info *
 _e_win_info_new(Ecore_Window id, uint32_t res_id, int pid, Eina_Bool alpha, int opaque, const char *name,
-                int x, int y, int w, int h, int layer, int visible, int mapped, int visibility, int iconic,
-                int frame_visible, int focused, int hwc, int hwc_policy, int pl_zpos, Ecore_Window parent_id,
+                int x, int y, int w, int h, int layer, int visible, int mapped, int visibility, Eina_Bool force_obscured,
+                int iconic, int frame_visible, int focused, int hwc, int hwc_policy, int pl_zpos, Ecore_Window parent_id,
                 const char *layer_name, Eina_Bool has_input_region, Eina_Bool transformed)
 {
    E_Win_Info *win = NULL;
@@ -398,6 +399,7 @@ _e_win_info_new(Ecore_Window id, uint32_t res_id, int pid, Eina_Bool alpha, int
    win->vis = visible;
    win->mapped = mapped;
    win->visibility = visibility;
+   win->force_obscured = force_obscured;
    win->frame_visible = frame_visible;
    win->iconic = iconic;
    win->focused = focused;
@@ -437,7 +439,7 @@ _e_win_info_make_array(Eldbus_Message_Iter *array)
         const char *win_name;
         const char *layer_name;
         int x, y, w, h, layer, visibility, opaque, hwc, hwc_policy, pl_zpos;
-        Eina_Bool visible, mapped, alpha, iconic, focused, frame_visible, transformed;
+        Eina_Bool visible, mapped, alpha, force_obscured, iconic, focused, frame_visible, transformed;
         Ecore_Window id, parent_id;
         uint32_t res_id;
         int pid;
@@ -459,6 +461,7 @@ _e_win_info_make_array(Eldbus_Message_Iter *array)
                                                 &alpha,
                                                 &opaque,
                                                 &visibility,
+                                                &force_obscured,
                                                 &iconic,
                                                 &frame_visible,
                                                 &focused,
@@ -476,7 +479,7 @@ _e_win_info_make_array(Eldbus_Message_Iter *array)
           }
 
         win = _e_win_info_new(id, res_id, pid, alpha, opaque, win_name, x, y, w, h,
-                              layer, visible, mapped, visibility, iconic, frame_visible,
+                              layer, visible, mapped, visibility, force_obscured, iconic, frame_visible,
                               focused, hwc, hwc_policy, pl_zpos, parent_id, layer_name,
                               has_input_region, transformed);
         e_info_client.win_list = eina_list_append(e_info_client.win_list, win);
@@ -1096,7 +1099,7 @@ _e_info_client_proc_ec_list_info(void)
           }
 
         printf("%3d 0x%08zx  %5d  %5d  %c %5d %5d %6d %6d   %c    %c   %3d  %2d   ", i, win->id, win->res_id, win->pid, win->transformed ? 'O':' ', win->w, win->h, win->x, win->y, win->focused ? 'O':' ', win->has_input_region?'C':' ', win->alpha? 32:24, win->opaque);
-        printf("%2d    %d   %d   %s   %3d    %-8s %-8zx   %s\n", win->visibility, win->iconic, win->vis, win->mapped? "V":"N", win->frame_visible, tmp, win->parent_id, win->name?:"No Name");
+        printf("%2d%c   %d   %d   %s   %3d    %-8s %-8zx   %s\n", win->visibility, win->force_obscured ? 'f':' ', win->iconic, win->vis, win->mapped? "V":"N", win->frame_visible, tmp, win->parent_id, win->name?:"No Name");
      }
 
    if (prev_layer_name)
@@ -1224,7 +1227,7 @@ _e_info_client_proc_topvwins_info(int argc, char **argv)
           }
 
         printf("%3d 0x%08zx  %5d  %5d  %5d %5d %6d %6d   %c    %c   %3d  %2d   ", i, win->id, win->res_id, win->pid, win->w, win->h, win->x, win->y, win->focused ? 'O':' ', win->has_input_region?'C':' ', win->alpha? 32:24, win->opaque);
-        printf("%2d    %d   %d   %s   %3d    %-8s %-8zx   %s\n", win->visibility, win->iconic, win->vis, win->mapped? "V":"N", win->frame_visible, tmp, win->parent_id, win->name?:"No Name");
+        printf("%2d%c   %d   %d   %s   %3d    %-8s %-8zx   %s\n", win->visibility, win->force_obscured ? 'f':' ', win->iconic, win->vis, win->mapped? "V":"N", win->frame_visible, tmp, win->parent_id, win->name?:"No Name");
      }
 
    if (prev_layer_name)
@@ -1325,7 +1328,7 @@ _e_info_client_proc_topwins_info(int argc, char **argv)
           }
 
         printf("%3d 0x%08zx  %5d  %5d  %5d %5d %6d %6d   %c    %c   %3d  %2d   ", i, win->id, win->res_id, win->pid, win->w, win->h, win->x, win->y, win->focused ? 'O':' ', win->has_input_region ? 'C':' ',win->alpha? 32:24, win->opaque);
-        printf("%2d    %d   %d   %s   %3d    %-8s %-8zx   %s\n", win->visibility, win->iconic, win->vis, win->mapped? "V":"N", win->frame_visible, tmp, win->parent_id, win->name?:"No Name");
+        printf("%2d%c   %d   %d   %s   %3d    %-8s %-8zx   %s\n", win->visibility, win->force_obscured? 'f':' ', win->iconic, win->vis, win->mapped? "V":"N", win->frame_visible, tmp, win->parent_id, win->name?:"No Name");
      }
 
    if (prev_layer_name)

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index c7c1127093c0cb98512b8f5b60638996e91113cc..311d5a74acdb510801cceaad8b8ac7052951f5c1 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -74,7 +74,7 @@ static Eina_List *module_hook = NULL;
    str_r -= str_l; \
 } while(0)
 
-#define VALUE_TYPE_FOR_TOPVWINS "uuisiiiiibbbiiibbiiiusbb"
+#define VALUE_TYPE_FOR_TOPVWINS "uuisiiiiibbbiibibbiiiusbb"
 #define VALUE_TYPE_REQUEST_RESLIST "ui"
 #define VALUE_TYPE_REPLY_RESLIST "ssi"
 #define VALUE_TYPE_FOR_INPUTDEV "ssi"
@@ -305,7 +305,7 @@ _msg_ecs_append(Eldbus_Message_Iter *iter, Eina_Bool is_visible)
             pid,
             e_client_util_name_get(ec) ?: "NO NAME",
             x, y, w, h, ec->layer,
-            ec->visible, mapped, ec->argb, ec->visibility.opaque, ec->visibility.obscured, iconified,
+            ec->visible, mapped, ec->argb, ec->visibility.opaque, ec->visibility.obscured, ec->visibility.force_obscured, iconified,
             evas_object_visible_get(ec->frame), ec->focused, hwc, hwc_policy, pl_zpos, pwin, layer_name, has_input_region, transformed);
 
         eldbus_message_iter_container_close(array_of_ec, struct_of_ec);
@@ -395,7 +395,7 @@ _msg_clients_append(Eldbus_Message_Iter *iter, Eina_Bool is_visible)
             pid,
             e_client_util_name_get(ec) ?: "NO NAME",
             ec->x, ec->y, ec->w, ec->h, ec->layer,
-            ec->visible, mapped, ec->argb, ec->visibility.opaque, ec->visibility.obscured, iconified,
+            ec->visible, mapped, ec->argb, ec->visibility.opaque, ec->visibility.obscured, ec->visibility.force_obscured, iconified,
             evas_object_visible_get(ec->frame), ec->focused, hwc, hwc_policy, pl_zpos, pwin, layer_name, has_input_region, transformed);
 
         eldbus_message_iter_container_close(array_of_ec, struct_of_ec);