Revert "keyrouter: simplify chained if-statements with AND operator"

This reverts commit 672574a5482de9419e372108762b1d9983df171c.

Change-Id: I9cc0e4a92d9681d01fb44d702e6db2a60f04e3ec

diff --git a/src/bin/e_keyrouter_list.c b/src/bin/e_keyrouter_list.c
index de87c62..5830987 100644 (file)
--- a/src/bin/e_keyrouter_list.c
+++ b/src/bin/e_keyrouter_list.c
@@ -223,19 +223,21 @@ e_keyrouter_find_and_remove_client_from_list(struct wl_resource *surface, struct
      {
         if (!key_node_data) continue;
 
-        if (surface && (surface == key_node_data->surface))
+        if (surface)
           {
-             if (mode == TIZEN_KEYROUTER_MODE_PRESSED)
-               {
-                  key_node_data->status = E_KRT_CSTAT_UNGRAB;
-               }
-             else
+             if (surface == key_node_data->surface)
                {
-                  *list = eina_list_remove_list(*list, l);
-                  E_FREE(key_node_data);
+                  if (mode == TIZEN_KEYROUTER_MODE_PRESSED)
+                    {
+                       key_node_data->status = E_KRT_CSTAT_UNGRAB;
+                    }
+                  else
+                    {
+                       *list = eina_list_remove_list(*list, l);
+                       E_FREE(key_node_data);
+                    }
+                  KLDBG("Remove a %s Mode Grabbed key(%d) by surface(%p)", e_keyrouter_mode_to_string(mode), key, surface);
                }
-             KLDBG("Remove a %s Mode grabbed key(%d) by surface(%p)", e_keyrouter_mode_to_string(mode), key, surface);
-             return;
           }
         else if ((wc == key_node_data->wc))
           {
@@ -270,11 +272,14 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien
           {
              if (!key_node_data) continue;
 
-             if (surface && (surface == key_node_data->surface))
+             if (surface)
                {
-                  krt->HardKeys[i].excl_ptr = eina_list_remove_list(krt->HardKeys[i].excl_ptr, l);
-                  E_FREE(key_node_data);
-                  KLDBG("Remove a Exclusive Mode Grabbed key(%d) by wl_surface(%p)", i, surface);
+                  if (surface == key_node_data->surface)
+                    {
+                       krt->HardKeys[i].excl_ptr = eina_list_remove_list(krt->HardKeys[i].excl_ptr, l);
+                       E_FREE(key_node_data);
+                       KLDBG("Remove a Exclusive Mode Grabbed key(%d) by wl_surface(%p)", i, surface);
+                    }
                }
              else if ((wc == key_node_data->wc))
                {
@@ -287,11 +292,14 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien
           {
              if (!key_node_data) continue;
 
-             if (surface && (surface == key_node_data->surface))
+             if (surface)
                {
-                  krt->HardKeys[i].or_excl_ptr = eina_list_remove_list(krt->HardKeys[i].or_excl_ptr, l);
-                  E_FREE(key_node_data);
-                  KLDBG("Remove a Overridable_Exclusive Mode Grabbed key(%d) by wl_surface(%p)", i, surface);
+                  if (surface == key_node_data->surface)
+                    {
+                       krt->HardKeys[i].or_excl_ptr = eina_list_remove_list(krt->HardKeys[i].or_excl_ptr, l);
+                       E_FREE(key_node_data);
+                       KLDBG("Remove a Overridable_Exclusive Mode Grabbed key(%d) by wl_surface(%p)", i, surface);
+                    }
                }
              else if ((wc == key_node_data->wc))
                {
@@ -304,11 +312,14 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien
           {
              if (!key_node_data) continue;
 
-             if (surface && (surface == key_node_data->surface))
+             if (surface)
                {
-                  krt->HardKeys[i].top_ptr = eina_list_remove_list(krt->HardKeys[i].top_ptr, l);
-                  E_FREE(key_node_data);
-                  KLDBG("Remove a Topmost Mode Grabbed key(%d) by wl_surface(%p)", i, surface);
+                  if (surface == key_node_data->surface)
+                    {
+                       krt->HardKeys[i].top_ptr = eina_list_remove_list(krt->HardKeys[i].top_ptr, l);
+                       E_FREE(key_node_data);
+                       KLDBG("Remove a Topmost Mode Grabbed key(%d) by wl_surface(%p)", i, surface);
+                    }
                }
              else if ((wc == key_node_data->wc))
                {
@@ -321,11 +332,14 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien
           {
              if (!key_node_data) continue;
 
-             if (surface && (surface == key_node_data->surface))
+             if (surface)
                {
-                  krt->HardKeys[i].shared_ptr = eina_list_remove_list(krt->HardKeys[i].shared_ptr, l);
-                  E_FREE(key_node_data);
-                  KLDBG("Remove a Shared Mode Grabbed key(%d) by wl_surface(%p)", i, surface);
+                  if (surface == key_node_data->surface)
+                    {
+                       krt->HardKeys[i].shared_ptr = eina_list_remove_list(krt->HardKeys[i].shared_ptr, l);
+                       E_FREE(key_node_data);
+                       KLDBG("Remove a Shared Mode Grabbed key(%d) by wl_surface(%p)", i, surface);
+                    }
                }
              else if ((wc == key_node_data->wc))
                {
@@ -338,11 +352,14 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien
           {
              if (!key_node_data) continue;
 
-             if (surface && (surface == key_node_data->surface))
+             if (surface)
                {
-                  key_node_data->status = E_KRT_CSTAT_DEAD;
-                  KLDBG("Remove a Pressed  key(%d) by wl_surface(%p)", i, surface);
-                  key_node_data->wc = wl_resource_get_client(surface);
+                  if (surface == key_node_data->surface)
+                    {
+                       key_node_data->status = E_KRT_CSTAT_DEAD;
+                       KLDBG("Remove a Pressed  key(%d) by wl_surface(%p)", i, surface);
+                       key_node_data->wc = wl_resource_get_client(surface);
+                    }
                }
              else if ((wc == key_node_data->wc))
                {
@@ -353,10 +370,13 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien
         EINA_LIST_FOREACH_SAFE(krt->HardKeys[i].pic_off_ptr, l, l_next, key_node_data)
           {
              if (!key_node_data) continue;
-             if (surface && (surface == key_node_data->surface))
+             if (surface)
                {
-                  krt->HardKeys[i].pic_off_ptr = eina_list_remove_list(krt->HardKeys[i].pic_off_ptr, l);
-                  E_FREE(key_node_data);
+                  if (surface == key_node_data->surface)
+                    {
+                       krt->HardKeys[i].pic_off_ptr = eina_list_remove_list(krt->HardKeys[i].pic_off_ptr, l);
+                       E_FREE(key_node_data);
+                    }
                }
              else if ( wc == key_node_data->wc)
                {