e_info: add buffer_flush option for select window

now you can use enlightenment_info -buffer_flush [on / off / show]
<win_id / all>
for enable/disable buffer_flush option

Change-Id: I5fe78bbe6401a40f303444fb0f55cc4a5ed6c43f

diff --git a/src/bin/e_info_client.c b/src/bin/e_info_client.c
index 0e9e70e90be31edf593de4b8421298eb3ae4e632..3622f271064fb877047a0e1d9651699901804d9b 100644 (file)
--- a/src/bin/e_info_client.c
+++ b/src/bin/e_info_client.c
@@ -4326,37 +4326,77 @@ finish:
 static void
 _e_info_client_proc_buffer_flush(int argc, char **argv)
 {
+   unsigned long winid = 0x0;
+   uint64_t send_winid = 0x0;
+   Ecore_Window win = 0;
    Eina_Bool res = EINA_FALSE;
+   int option = -1;
+   char *win_name = NULL;
 
-   EINA_SAFETY_ON_FALSE_GOTO((argc == 3), usage);
+   EINA_SAFETY_ON_FALSE_GOTO((argc == 3) || (argc == 4), usage);
    EINA_SAFETY_ON_FALSE_GOTO((!strcmp(argv[2], "on")) ||
                              (!strcmp(argv[2], "off")) ||
                              (!strcmp(argv[2], "show")), usage);
 
-   if (!strcmp(argv[2], "on"))
+   if (argc == 4)
      {
-        res = _e_info_client_eldbus_message_with_args("buffer_flush",
-                                                      _e_info_client_cb_buffer_flush,
-                                                      "i",
-                                                      1);
-     }
-   else if (!strcmp(argv[2], "off"))
-     {
-        res = _e_info_client_eldbus_message_with_args("buffer_flush",
-                                                      _e_info_client_cb_buffer_flush,
-                                                      "i",
-                                                      0);
-     }
-   else if (!strcmp(argv[2], "show"))
-     {
-        res = _e_info_client_eldbus_message_with_args("buffer_flush",
-                                                      _e_info_client_cb_buffer_flush,
-                                                      "i",
-                                                      2);
+        // if input has window id, convert to ulong
+        if (!strcmp(argv[3], "all"))
+          res = EINA_TRUE;
+        else if ((strlen(argv[3]) >= 2) && (argv[3][0] == '0') && ((argv[3][1] == 'x') || (argv[3][1] == 'X')))
+          res = _util_string_to_ulong(argv[3], &winid, 16);
+        else
+          res = _util_string_to_ulong(argv[3], &winid, 10);
+        if (!res)
+          {
+             printf("error occured while parsing winid: %s\n", argv[3]);
+             return;
+          }
+
+        send_winid = (uint64_t) winid;
      }
-   else
-     goto usage;
 
+   if (!strcmp(argv[2], "show"))
+     option = 2;
+   else{
+        if (argc == 3)
+          {
+             // get winid from touch
+             printf("Select the window whose property(ies) you wish to get/set\n");
+             if (!_e_get_window_under_touch(&win))
+               {
+                  win_name = _e_get_window_name(win);
+                  if (!win_name)
+                    {
+                       printf("failed to get window under touch\n");
+                       return;
+                    }
+
+                  printf("%s %s: window(%s) id : 0x%08x\n", argv[0], argv[1], win_name, win);
+                  send_winid = (uint64_t) win;
+
+                  free(win_name);
+               }
+             else
+               {
+                  printf("failed to get window under touch\n");
+                  return;
+               }
+          }
+
+        if (!strcmp(argv[2], "on"))
+          option = 1;
+        else if (!strcmp(argv[2], "off"))
+          option = 0;
+        else
+          goto usage;
+   }
+
+   res = _e_info_client_eldbus_message_with_args("buffer_flush",
+                                                 _e_info_client_cb_buffer_flush,
+                                                 "it",
+                                                 option,
+                                                 send_winid);
    EINA_SAFETY_ON_FALSE_GOTO(res, error);
 
    return;
@@ -4365,11 +4405,14 @@ error:
    printf("Error occured while send send message\n\n");
 
 usage:
-   printf("Usage : %s %s [on / off / show]\n\n"
+   printf("Usage : %s %s [on <win_id / all>], [off <win_id / all>], [show <win_id / all>]\n\n"
           "\t on : turn on buffer_flush option\n"
           "\t off : turn off buffer_flush option\n"
           "\t show : show buffer_flush configuration\n",
           argv[0], argv[1]);
+   printf("\n\t %s %s on 0x12345678\n", argv[0], argv[1]);
+   printf("\t %s %s off all\n", argv[0], argv[1]);
+   printf("\t %s %s show 0x12345678\n", argv[0], argv[1]);
 
    return;
 }
@@ -4709,7 +4752,7 @@ static struct
    },
    {
       "buffer_flush",
-      "[on / off / show]",
+      "[on <win_id / all>], [off <win_id / all>], [show <win_id / all>]",
       "set buffer_flush configure",
       _e_info_client_proc_buffer_flush
    },

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index 1a43acdf38ac78d3b41ee100c5509d8527a5241a..cb21de6b8c9178759c5b34cf62b2b0569a201523 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -5261,32 +5261,70 @@ _e_info_server_cb_buffer_flush(const Eldbus_Service_Interface *iface EINA_UNUSED
    int msg_from_client = 0;
    char msg_to_client[128] = {0};
    E_Client *ec = NULL;
+   Ecore_Window win = 0;
 
-   if (!eldbus_message_arguments_get(msg, "i", &msg_from_client))
+   if (!eldbus_message_arguments_get(msg, "it", &msg_from_client, &win))
      {
         snprintf(msg_to_client, sizeof(msg_to_client), "Error occured while get message");
+        goto finish;
      }
-   else
+
+   if (win)
      {
-        switch (msg_from_client)
+        // find ec
+        ec = _e_info_server_ec_find_by_win(win);
+        if (ec == NULL)
           {
-           case 0:
-           case 1:
+             snprintf(msg_to_client, sizeof(msg_to_client), "Cannot find win 0x%08x!", win);
+             goto finish;
+          }
+     }
+
+   switch (msg_from_client)
+     {
+      case 0:
+      case 1:
+         if (ec)
+           {
+              // set buffer_flush to specified window
+              ec->exp_iconify.buffer_flush = msg_from_client;
+              snprintf(msg_to_client, sizeof(msg_to_client),
+                       "Successfully changed!\n"
+                       "win(0x%08x/%s)->buffer_flush : %s",
+                       win,
+                       ec->icccm.name,
+                       ec->exp_iconify.buffer_flush ? "on" : "off");
+           }
+         else
+           {
+              // set buffer_flush to all window
               e_config->use_buffer_flush = msg_from_client;
               for (ec = e_client_top_get(); ec; ec = e_client_below_get(ec))
                 {
                    ec->exp_iconify.buffer_flush = msg_from_client;
                 }
-              snprintf(msg_to_client, sizeof(msg_to_client), "Successfully changed!  e_config->buffer_flush : %s",
-                       e_config->use_buffer_flush ? "on" : "off");
-              break;
-           default:
-              snprintf(msg_to_client, sizeof(msg_to_client), "Current option: e_config->buffer_flush : %s",
+
+              snprintf(msg_to_client, sizeof(msg_to_client),
+                       "Successfully changed!\n"
+                       "e_config->use_buffer_flush : %s",
                        e_config->use_buffer_flush ? "on" : "off");
-              break;
-          }
+           }
+         break;
+      default:
+         snprintf(msg_to_client, sizeof(msg_to_client), "Current option: e_config->use_buffer_flush : %s",
+                  e_config->use_buffer_flush ? "on" : "off");
+         if (ec)
+           {
+              snprintf(msg_to_client + strlen(msg_to_client),
+                       sizeof(msg_to_client) - strlen(msg_to_client),
+                       "\n\t\twin(0x%08x)->buffer_flush : %s",
+                       win,
+                       ec->exp_iconify.buffer_flush ? "on" : "off");
+           }
+         break;
      }
 
+finish:
    reply = eldbus_message_method_return_new(msg);
    eldbus_message_arguments_append(reply, "s", msg_to_client);
 
@@ -5390,8 +5428,8 @@ static const Eldbus_Method methods[] = {
    { "module_load", ELDBUS_ARGS({"s", "target module"}), ELDBUS_ARGS({"s", "load result"}), _e_info_server_cb_module_load, 0 },
    { "module_unload", ELDBUS_ARGS({"s", "target module"}), ELDBUS_ARGS({"s", "unload result"}), _e_info_server_cb_module_unload, 0 },
    { "shutdown", NULL, ELDBUS_ARGS({"s", "shutdown result"}), _e_info_server_cb_shutdown, 0 },
-   { "buffer_flush", ELDBUS_ARGS({"i", "option"}), ELDBUS_ARGS({"s", "buffer_flush status"}), _e_info_server_cb_buffer_flush, 0},
    { "deiconify_approve", ELDBUS_ARGS({"i", "option"}), ELDBUS_ARGS({"s", "deiconify_approve status"}), _e_info_server_cb_deiconify_approve, 0},
+   { "buffer_flush", ELDBUS_ARGS({"it", "option"}), ELDBUS_ARGS({"s", "buffer_flush status"}), _e_info_server_cb_buffer_flush, 0},
    { NULL, NULL, NULL, NULL, 0 }
 };