enlightenment_info: added opaque information

Change-Id: Ic66cff174e41288ce83e275ccc4a4adf5877a73f

diff --git a/src/bin/e_info_client.c b/src/bin/e_info_client.c
index 8e0e51c..fd3513b 100644 (file)
--- a/src/bin/e_info_client.c
+++ b/src/bin/e_info_client.c
@@ -27,13 +27,14 @@ typedef struct _E_Win_Info
    int          layer;      // value of E_Layer
    int          vis;        // visibility
    int          alpha;      // alpha window
+   int          opaque;
    int          visibility;
    int          iconic;
    int          focused;
    const char  *layer_name; // layer name
 } E_Win_Info;
 
-#define VALUE_TYPE_FOR_TOPVWINS "uuisiiiiibbibbs"
+#define VALUE_TYPE_FOR_TOPVWINS "uuisiiiiibbiibbs"
 
 static E_Info_Client e_info_client;
 
@@ -41,7 +42,7 @@ static Eina_Bool _e_info_client_eldbus_message(const char *method, E_Info_Messag
 static Eina_Bool _e_info_client_eldbus_message_with_args(const char *method, E_Info_Message_Cb cb, const char *signature, ...);
 
 static E_Win_Info *
-_e_win_info_new(Ecore_Window id, uint32_t res_id, int pid, Eina_Bool alpha, const char *name, int x, int y, int w, int h, int layer, int visible, int visibility, int iconic, int focused, const char *layer_name)
+_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 visibility, int iconic, int focused, const char *layer_name)
 {
    E_Win_Info *win = NULL;
 
@@ -58,6 +59,7 @@ _e_win_info_new(Ecore_Window id, uint32_t res_id, int pid, Eina_Bool alpha, cons
    win->h = h;
    win->layer = layer;
    win->alpha = alpha;
+   win->opaque = opaque;
    win->vis = visible;
    win->visibility = visibility;
    win->iconic = iconic;
@@ -98,7 +100,7 @@ _cb_window_info_get(const Eldbus_Message *msg)
      {
         const char *win_name;
         const char *layer_name;
-        int x, y, w, h, layer, visibility;
+        int x, y, w, h, layer, visibility, opaque;
         Eina_Bool visible, alpha, iconic, focused;
         Ecore_Window id;
         uint32_t res_id;
@@ -117,6 +119,7 @@ _cb_window_info_get(const Eldbus_Message *msg)
                                                 &layer,
                                                 &visible,
                                                 &alpha,
+                                                &opaque,
                                                 &visibility,
                                                 &iconic,
                                                 &focused,
@@ -127,7 +130,7 @@ _cb_window_info_get(const Eldbus_Message *msg)
              continue;
           }
 
-        win = _e_win_info_new(id, res_id, pid, alpha, win_name, x, y, w, h, layer, visible, visibility, iconic, focused, layer_name);
+        win = _e_win_info_new(id, res_id, pid, alpha, opaque, win_name, x, y, w, h, layer, visible, visibility, iconic, focused, layer_name);
         e_info_client.win_list = eina_list_append(e_info_client.win_list, win);
      }
 
@@ -152,7 +155,7 @@ _e_info_client_proc_topvwins_info(int argc, char **argv)
 
    printf("%d Top level windows\n", eina_list_count(e_info_client.win_list));
    printf("--------------------------------------[ topvwins ]----------------------------------------------------------\n");
-   printf(" No   Win_ID    RcsID    PID     w     h     x      y     Focus Depth Visi Icon  Map_State    Title              \n");
+   printf(" No   Win_ID    RcsID    PID     w     h     x      y   Focus Depth Opaq Visi Icon  Map_State    Title              \n");
    printf("------------------------------------------------------------------------------------------------------------\n");
 
    if (!e_info_client.win_list)
@@ -173,7 +176,7 @@ _e_info_client_proc_topvwins_info(int argc, char **argv)
              prev_layer = win->layer;
              prev_layer_name = win->layer_name;
           }
-        printf("%3d 0x%08x  %5d  %5d  %5d %5d %6d %6d     %c  %5d   ", i, win->id, win->res_id, win->pid, win->w, win->h, win->x, win->y, win->focused ? 'O':' ', win->alpha? 32:24);
+        printf("%3d 0x%08x  %5d  %5d  %5d %5d %6d %6d   %c  %5d    %d   ", i, win->id, win->res_id, win->pid, win->w, win->h, win->x, win->y, win->focused ? 'O':' ', win->alpha? 32:24, win->opaque);
         printf("%2d    %d   %-11s  %s\n", win->visibility, win->iconic, win->vis? "Viewable":"NotViewable", win->name?:"No Name");
      }
 

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index 5ba2e01..d617e61 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -29,7 +29,7 @@ struct wl_drm_buffer
    void *driver_buffer;
 };
 
-#define VALUE_TYPE_FOR_TOPVWINS "uuisiiiiibbibbs"
+#define VALUE_TYPE_FOR_TOPVWINS "uuisiiiiibbiibbs"
 
 static void
 _msg_clients_append(Eldbus_Message_Iter *iter)
@@ -75,7 +75,7 @@ _msg_clients_append(Eldbus_Message_Iter *iter)
             pid,
             e_client_util_name_get(ec) ?: "NO NAME",
             ec->x, ec->y, ec->w, ec->h, ec->layer,
-            ec->visible, ec->argb, ec->visibility.obscured, ec->iconic, ec->focused, layer_name);
+            ec->visible, ec->argb, ec->visibility.opaque, ec->visibility.obscured, ec->iconic, ec->focused, layer_name);
 
         eldbus_message_iter_container_close(array_of_ec, struct_of_ec);
      }