e_comp: change mutex name for ec list

Change-Id: I9df0b52715f784b8d36b54bc69b707bef719e223
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index fb17e2a..c59b871 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -3739,7 +3739,7 @@ e_client_above_get(const E_Client *ec)
    if (ec->layer == E_LAYER_CLIENT_CURSOR) return NULL;
    if (e_comp_canvas_client_layer_map(ec->layer) == 9999) return NULL;
 
-   g_rec_mutex_lock(&e_comp->input_key_grabs_mutex);
+   g_rec_mutex_lock(&e_comp->ec_list_mutex);
    /* go up the layers until we find one */
    for (x = e_comp_canvas_layer_map(ec->layer) + 1; x <= e_comp_canvas_layer_map(E_LAYER_CLIENT_CURSOR); x++)
      {
@@ -3754,12 +3754,12 @@ e_client_above_get(const E_Client *ec)
                }
              if (!e_object_is_del(E_OBJECT(ec2)))
                {
-                  g_rec_mutex_unlock(&e_comp->input_key_grabs_mutex);
+                  g_rec_mutex_unlock(&e_comp->ec_list_mutex);
                   return ec2;
                }
           }
      }
-   g_rec_mutex_unlock(&e_comp->input_key_grabs_mutex);
+   g_rec_mutex_unlock(&e_comp->ec_list_mutex);
 
    return NULL;
 }
@@ -3815,7 +3815,7 @@ e_client_below_get(const E_Client *ec)
    x = e_comp_canvas_layer_map(ec_layer);
    if (x > 0) x--;
 
-   g_rec_mutex_lock(&e_comp->input_key_grabs_mutex);
+   g_rec_mutex_lock(&e_comp->ec_list_mutex);
    for (; x >= e_comp_canvas_layer_map(E_LAYER_CLIENT_DESKTOP); x--)
      {
         if (!e_comp->layers[x].clients) continue;
@@ -3829,12 +3829,12 @@ e_client_below_get(const E_Client *ec)
                }
              if (!e_object_is_del(E_OBJECT(ec2)))
                {
-                  g_rec_mutex_unlock(&e_comp->input_key_grabs_mutex);
+                  g_rec_mutex_unlock(&e_comp->ec_list_mutex);
                   return ec2;
                }
           }
      }
-   g_rec_mutex_unlock(&e_comp->input_key_grabs_mutex);
+   g_rec_mutex_unlock(&e_comp->ec_list_mutex);
 
    return NULL;
 }
@@ -3843,7 +3843,7 @@ E_API E_Client *
 e_client_bottom_get(void)
 {
    unsigned int x;
-   g_rec_mutex_lock(&e_comp->input_key_grabs_mutex);
+   g_rec_mutex_lock(&e_comp->ec_list_mutex);
    for (x = e_comp_canvas_layer_map(E_LAYER_CLIENT_DESKTOP); x <= e_comp_canvas_layer_map(E_LAYER_CLIENT_CURSOR); x++)
      {
         E_Client *ec2;
@@ -3852,11 +3852,11 @@ e_client_bottom_get(void)
         EINA_INLIST_FOREACH(e_comp->layers[x].clients, ec2)
           if (!e_object_is_del(E_OBJECT(ec2)))
             {
-               g_rec_mutex_unlock(&e_comp->input_key_grabs_mutex);
+               g_rec_mutex_unlock(&e_comp->ec_list_mutex);
                return ec2;
             }
      }
-   g_rec_mutex_unlock(&e_comp->input_key_grabs_mutex);
+   g_rec_mutex_unlock(&e_comp->ec_list_mutex);
 
    return NULL;
 }
@@ -3865,7 +3865,7 @@ E_API E_Client *
 e_client_top_get(void)
 {
    unsigned int x;
-   g_rec_mutex_lock(&e_comp->input_key_grabs_mutex);
+   g_rec_mutex_lock(&e_comp->ec_list_mutex);
    for (x = e_comp_canvas_layer_map(E_LAYER_CLIENT_CURSOR); x >= e_comp_canvas_layer_map(E_LAYER_CLIENT_DESKTOP); x--)
      {
         E_Client *ec2;
@@ -3874,11 +3874,11 @@ e_client_top_get(void)
         EINA_INLIST_REVERSE_FOREACH(e_comp->layers[x].clients, ec2)
           if (!e_object_is_del(E_OBJECT(ec2)))
             {
-               g_rec_mutex_unlock(&e_comp->input_key_grabs_mutex);
+               g_rec_mutex_unlock(&e_comp->ec_list_mutex);
                return ec2;
             }
      }
-   g_rec_mutex_unlock(&e_comp->input_key_grabs_mutex);
+   g_rec_mutex_unlock(&e_comp->ec_list_mutex);
 
    return NULL;
 }

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 585251c..952cac0 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -453,7 +453,7 @@ e_comp_init(void)
    E_LIST_HANDLER_APPEND(handlers, ECORE_EVENT_SIGNAL_USER, _e_comp_signal_user,     NULL);
    E_LIST_HANDLER_APPEND(handlers, E_EVENT_COMP_OBJECT_ADD, _e_comp_object_add,      NULL);
 
-   g_rec_mutex_init(&e_comp->input_key_grabs_mutex);
+   g_rec_mutex_init(&e_comp->ec_list_mutex);
 
    return EINA_TRUE;
 }
@@ -510,7 +510,7 @@ e_comp_shutdown(void)
 
    E_FREE_FUNC(ignores, eina_hash_free);
 
-   g_rec_mutex_clear(&e_comp->input_key_grabs_mutex);
+   g_rec_mutex_clear(&e_comp->ec_list_mutex);
 
    return 1;
 }

diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h
index 205f98f..ee78165 100644 (file)
--- a/src/bin/e_comp.h
+++ b/src/bin/e_comp.h
@@ -191,7 +191,7 @@ struct _E_Comp
       double interval; // time value the interval of commit_handler after tdm_commit in second (default : 0)
    } commit_handler_timer;
 
-   GRecMutex          input_key_grabs_mutex;
+   GRecMutex          ec_list_mutex;
 };
 
 struct _E_Comp_Connected_Client_Info

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 0228fec..06a0e19 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -600,7 +600,7 @@ _e_comp_object_layers_add(E_Comp_Object *cw, E_Comp_Object *above, E_Comp_Object
    /* try to get the internal data for the layer;
     * will return NULL for fake layers (eg. wayland)
     */
-   g_rec_mutex_lock(&e_comp->input_key_grabs_mutex);
+   g_rec_mutex_lock(&e_comp->ec_list_mutex);
    if (e_comp->layers[cw->layer].obj)
      {
         if (evas_object_smart_smart_get(e_comp->layers[cw->layer].obj))
@@ -621,17 +621,17 @@ _e_comp_object_layers_add(E_Comp_Object *cw, E_Comp_Object *above, E_Comp_Object
           e_comp->layers[cw->layer].clients = eina_inlist_append(e_comp->layers[cw->layer].clients, EINA_INLIST_GET(cw->ec));
      }
    e_comp->layers[cw->layer].clients_count++;
-   g_rec_mutex_unlock(&e_comp->input_key_grabs_mutex);
+   g_rec_mutex_unlock(&e_comp->ec_list_mutex);
 #ifndef E_RELEASE_BUILD
    if (layer_cw)
      {
         E_Client *below_ec = e_client_below_get(cw->ec);
         if (below_ec)
           {
-             g_rec_mutex_lock(&e_comp->input_key_grabs_mutex);
+             g_rec_mutex_lock(&e_comp->ec_list_mutex);
              if (e_comp->layers[cw->layer].obj == below_ec->frame)
                CRI("ACK! ec:%p", cw->ec);
-             g_rec_mutex_unlock(&e_comp->input_key_grabs_mutex);
+             g_rec_mutex_unlock(&e_comp->ec_list_mutex);
           }
      }
 #endif
@@ -640,13 +640,13 @@ _e_comp_object_layers_add(E_Comp_Object *cw, E_Comp_Object *above, E_Comp_Object
 static void
 _e_comp_object_layers_remove(E_Comp_Object *cw)
 {
-   g_rec_mutex_lock(&e_comp->input_key_grabs_mutex);
+   g_rec_mutex_lock(&e_comp->ec_list_mutex);
    if (cw->ec && e_comp->layers[cw->layer].clients)
      {
         e_comp->layers[cw->layer].clients = eina_inlist_remove(e_comp->layers[cw->layer].clients, EINA_INLIST_GET(cw->ec));
         e_comp->layers[cw->layer].clients_count--;
      }
-   g_rec_mutex_unlock(&e_comp->input_key_grabs_mutex);
+   g_rec_mutex_unlock(&e_comp->ec_list_mutex);
 /*
    e_comp->layers[cw->layer].objs = eina_inlist_remove(e_comp->layers[cw->layer].objs, EINA_INLIST_GET(cw));
    e_comp->layers[cw->layer].objs_count--;