summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2014-07-29 13:30:15 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2014-08-13 10:22:52 -0400
commit1c3f60db61eccce4f598e02febe93c96b0cdb503 (patch)
treea2ea4ad7b3787a11bac8d749f1238920d8cc0337
parent2856232b9e5fcd942c416e4a255c5968c83c90f6 (diff)
downloadenlightenment-1c3f60db61eccce4f598e02febe93c96b0cdb503.tar.gz
Reduce potential of unnecessary function calls:
- When we are doing client eval, don't check for Just changes in property OR fetching. Rather we will check using an AND. Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/bin/e_comp_wl.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 9a959349f1..31042c4932 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2468,6 +2468,7 @@ _e_comp_wl_client_new_helper(E_Client *ec)
EC_CHANGED(ec);
ec->take_focus = !starting;
}
+
ec->new_client ^= ec->override;
if (e_pixmap_size_changed(ec->pixmap, ec->client.w, ec->client.h))
@@ -2664,21 +2665,19 @@ _e_comp_wl_cb_hook_client_eval_fetch(void *data EINA_UNUSED, E_Client *ec)
E_COMP_WL_PIXMAP_CHECK;
- /* DBG("COMP_WL HOOK CLIENT EVAL FETCH !!"); */
-
- if ((ec->changes.prop) || (ec->netwm.fetch.state))
+ if ((ec->changes.prop) && (ec->netwm.fetch.state))
{
e_hints_window_state_get(ec);
ec->netwm.fetch.state = EINA_FALSE;
}
- if ((ec->changes.prop) || (ec->e.fetch.state))
+ if ((ec->changes.prop) && (ec->e.fetch.state))
{
e_hints_window_e_state_get(ec);
ec->e.fetch.state = EINA_FALSE;
}
- if ((ec->changes.prop) || (ec->netwm.fetch.type))
+ if ((ec->changes.prop) && (ec->netwm.fetch.type))
{
e_hints_window_type_get(ec);
if (((!ec->lock_border) || (!ec->border.name)) &&
@@ -2866,7 +2865,7 @@ _e_comp_wl_cb_hook_client_eval_fetch(void *data EINA_UNUSED, E_Client *ec)
/* eina_rectangle_free(shape); */
/* } */
- if ((ec->changes.prop) || (ec->netwm.update.state))
+ if ((ec->changes.prop) && (ec->netwm.update.state))
{
e_hints_window_state_set(ec);
if (((!ec->lock_border) || (!ec->border.name)) &&