e_info_client: fix wrong info of hwc disable in hwc planes mode 49/220449/1
authorChangyeon Lee <cyeon.lee@samsung.com>
Thu, 12 Dec 2019 12:15:57 +0000 (21:15 +0900)
committerChangyeon Lee <cyeon.lee@samsung.com>
Wed, 18 Dec 2019 09:47:22 +0000 (18:47 +0900)
Change-Id: Ia59e2a2b74d1e638d896b59d66bbe11442343498

src/bin/e_info_client.c

index dea2a74..680370f 100644 (file)
@@ -1059,7 +1059,7 @@ _e_info_client_proc_ec_list_info(void)
              prev_layer_name = win->layer_name;
           }
 
-        if (e_info_client.hwc)
+        if (win->hwc >= 0)
           {
              if (win->hwc_policy == E_HWC_POLICY_WINDOWS) // hwc windows
                {
@@ -1073,28 +1073,20 @@ _e_info_client_proc_ec_list_info(void)
                      default:                        snprintf(tmp, sizeof(tmp), "  -  "); break;
                     }
                }
-             else                           // hwc planes
+             else // hwc planes
                {
-                  if (win->hwc >= 0)
+                  if ((!win->iconic) && (win->frame_visible))
                     {
-                       if ((!win->iconic) && (win->frame_visible))
+                       if (win->pl_zpos == -999)
+                         snprintf(tmp, sizeof(tmp), " - ");
+                       else
                          {
-                            if (win->pl_zpos == -999)
-                              snprintf(tmp, sizeof(tmp), " - ");
-                            else
-                              {
-                                 if (win->hwc) snprintf(tmp, sizeof(tmp), "hwc@%i", win->pl_zpos);
-                                 else snprintf(tmp, sizeof(tmp), "comp@%i", win->pl_zpos);
-                              }
+                            if (win->hwc) snprintf(tmp, sizeof(tmp), "hwc@%i", win->pl_zpos);
+                            else snprintf(tmp, sizeof(tmp), "comp@%i", win->pl_zpos);
                          }
-                       else
-                         snprintf(tmp, sizeof(tmp), " - ");
-                    }
-                  else // hwc is not initialized or hwc_deactive 1
-                    {
-                       hwc_off = 1;
-                       snprintf(tmp, sizeof(tmp), " - ");
                     }
+                  else
+                    snprintf(tmp, sizeof(tmp), " - ");
                }
           }
         else
@@ -1195,7 +1187,7 @@ _e_info_client_proc_topvwins_info(int argc, char **argv)
              prev_layer_name = win->layer_name;
           }
 
-        if (e_info_client.hwc_windows)
+        if (win->hwc >= 0)
           {
              if (win->hwc_policy == E_HWC_POLICY_WINDOWS) // hwc windows
                {
@@ -1209,7 +1201,7 @@ _e_info_client_proc_topvwins_info(int argc, char **argv)
                      default:                        snprintf(tmp, sizeof(tmp), "  -  "); break;
                     }
                }
-             else                           // hwc planes
+             else // hwc planes
                {
                   if ((!win->iconic) && (win->frame_visible))
                     {
@@ -1296,7 +1288,7 @@ _e_info_client_proc_topwins_info(int argc, char **argv)
              prev_layer_name = win->layer_name;
           }
 
-        if (e_info_client.hwc)
+        if (win->hwc >= 0)
           {
              if (win->hwc_policy == E_HWC_POLICY_WINDOWS) // hwc windows
                {
@@ -1310,28 +1302,20 @@ _e_info_client_proc_topwins_info(int argc, char **argv)
                      default:                        snprintf(tmp, sizeof(tmp), "  -  "); break;
                     }
                }
-             else                           // hwc planes
+             else // hwc planes
                {
-                  if (win->hwc >= 0)
+                  if ((!win->iconic) && (win->frame_visible))
                     {
-                       if ((!win->iconic) && (win->frame_visible))
+                       if (win->pl_zpos == -999)
+                         snprintf(tmp, sizeof(tmp), " - ");
+                       else
                          {
-                            if (win->pl_zpos == -999)
-                              snprintf(tmp, sizeof(tmp), " - ");
-                            else
-                              {
-                                 if (win->hwc) snprintf(tmp, sizeof(tmp), "hwc@%i", win->pl_zpos);
-                                 else snprintf(tmp, sizeof(tmp), "comp@%i", win->pl_zpos);
-                              }
+                            if (win->hwc) snprintf(tmp, sizeof(tmp), "hwc@%i", win->pl_zpos);
+                            else snprintf(tmp, sizeof(tmp), "comp@%i", win->pl_zpos);
                          }
-                       else
-                         snprintf(tmp, sizeof(tmp), " - ");
-                    }
-                  else // hwc is not initialized or hwc_deactive 1
-                    {
-                       hwc_off = 1;
-                       snprintf(tmp, sizeof(tmp), " - ");
                     }
+                  else
+                    snprintf(tmp, sizeof(tmp), " - ");
                }
           }
         else