[EGIT] [core/enlightenment] master 03/03: clean up shape input rect setting code

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=b10f81de08dc62856272530dce3a17d551f4ff64

commit b10f81de08dc62856272530dce3a17d551f4ff64
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Thu Jan 23 10:30:34 2014 -0500

    clean up shape input rect setting code
---
 src/bin/e_comp_x.c | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index fe89375..286461c 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -3662,28 +3662,12 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, 
E_Client *ec)
                  ((int)rects[0].width == cw) &&
                  ((int)rects[0].height == ch))
                {
-                  if (ec->shaped_input)
-                    {
-                       ec->shaped_input = 0;
-                       if (ec->comp_data->reparented && (!ec->bordername))
-                         {
-                            ec->border.changed = 1;
-                            EC_CHANGED(ec);
-                         }
-                    }
+                  ec->shaped_input = 0;
                   free(rects);
                }
              else
                {
-                  if (!ec->shaped_input)
-                    {
-                       ec->shaped_input = 1;
-                       if (ec->comp_data->reparented && (!ec->bordername))
-                         {
-                            ec->border.changed = 1;
-                            EC_CHANGED(ec);
-                         }
-                    }
+                  ec->shaped_input = 1;
                   if (ec->comp_data->reparented)
                     ecore_x_window_shape_input_rectangles_set(pwin, rects, 
num);
                   changed = EINA_TRUE;
@@ -3693,16 +3677,12 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, 
E_Client *ec)
                }
           }
         else
+          ec->shaped_input = 0;
+        if (changed || (pshaped != ec->shaped_input))
           {
-             ec->shaped_input = 1;
-             if (ec->comp_data->reparented && (!ec->bordername))
-               {
-                  ec->border.changed = 1;
-                  EC_CHANGED(ec);
-               }
+             ec->need_shape_merge = 1;
+             e_comp_shape_queue(ec->comp);
           }
-        if (changed || (pshaped != ec->shaped_input))
-          ec->need_shape_merge = 1;
      }
    if (ec->changes.prop || ec->mwm.fetch.hints)
      {

--