diff --git a/src/bin/e_resist.c b/src/bin/e_resist.c
index 12f2c0d1f..c760eb759 100644
--- a/src/bin/e_resist.c
+++ b/src/bin/e_resist.c
@@ -13,9 +13,9 @@ static void _e_resist_rects(Eina_List *rects, int px, int py, int pw, int ph, in
 
 EAPI int
 e_resist_container_border_position(E_Container *con, Eina_List *skiplist,
-				   int px, int py, int pw, int ph,
-				   int x, int y, int w, int h,
-				   int *rx, int *ry, int *rw, int *rh)
+                                   int px, int py, int pw, int ph,
+                                   int x, int y, int w, int h,
+                                   int *rx, int *ry, int *rw, int *rh)
 {
    Eina_List *l, *ll, *rects = NULL;
    E_Resist_Rect *r;
@@ -27,32 +27,32 @@ e_resist_container_border_position(E_Container *con, Eina_List *skiplist,
 
    if (!e_config->use_resist)
      {
-	*rx = x;
-	*ry = y;
-	*rw = w;
-	*rh = h;
-	return 0;
+        *rx = x;
+        *ry = y;
+        *rw = w;
+        *rh = h;
+        return 0;
      }
 
    /* edges of screen */
-#define OBSTACLE(_x, _y, _w, _h, _resist) \
-   { \
-      r = E_NEW(E_Resist_Rect, 1); \
-      r->x = _x; r->y = _y; r->w = _w; r->h = _h; r->v1 = _resist; \
-      r->resist_out = 0; \
-      rects = eina_list_append(rects, r); \
-   }
-#define HOLDER(_x, _y, _w, _h, _resist) \
-   { \
-      r = E_NEW(E_Resist_Rect, 1); \
-      r->x = _x; r->y = _y; r->w = _w; r->h = _h; r->v1 = _resist; \
-      r->resist_out = 1; \
-      rects = eina_list_append(rects, r); \
-   }
+#define OBSTACLE(_x, _y, _w, _h, _resist)                         \
+  {                                                               \
+     r = E_NEW(E_Resist_Rect, 1);                                 \
+     r->x = _x; r->y = _y; r->w = _w; r->h = _h; r->v1 = _resist; \
+     r->resist_out = 0;                                           \
+     rects = eina_list_append(rects, r);                          \
+  }
+#define HOLDER(_x, _y, _w, _h, _resist)                           \
+  {                                                               \
+     r = E_NEW(E_Resist_Rect, 1);                                 \
+     r->x = _x; r->y = _y; r->w = _w; r->h = _h; r->v1 = _resist; \
+     r->resist_out = 1;                                           \
+     rects = eina_list_append(rects, r);                          \
+  }
 
    EINA_LIST_FOREACH(con->zones, l, zone)
      {
-	HOLDER(zone->x, zone->y, zone->w, zone->h, e_config->desk_resist);
+        HOLDER(zone->x, zone->y, zone->w, zone->h, e_config->desk_resist);
      }
    /* FIXME: need to add resist or complete BLOCKS for things like ibar */
    /* can add code here to add more fake obstacles with custom resist values */
@@ -61,72 +61,72 @@ e_resist_container_border_position(E_Container *con, Eina_List *skiplist,
    bl = e_container_border_list_first(con);
    while ((bd = e_container_border_list_next(bl)))
      {
-	if (bd->visible)
-	  {
-	     int ok;
+        if (bd->visible)
+          {
+             int ok;
 
-	     ok = 1;
-	     EINA_LIST_FOREACH(skiplist, ll, bd2)
-	       {
-		  if (bd2 == bd)
-		    {
-		       ok = 0;
-		       break;
-		    }
-	       }
-	     if (ok && bd->offer_resistance)
-	       {
-		  OBSTACLE(bd->x, bd->y, bd->w, bd->h, e_config->window_resist);
-	       }
-	  }
+             ok = 1;
+             EINA_LIST_FOREACH(skiplist, ll, bd2)
+               {
+                  if (bd2 == bd)
+                    {
+                       ok = 0;
+                       break;
+                    }
+               }
+             if (ok && bd->offer_resistance)
+               {
+                  OBSTACLE(bd->x, bd->y, bd->w, bd->h, e_config->window_resist);
+               }
+          }
      }
    e_container_border_list_free(bl);
 
    desk = e_desk_current_get(e_zone_current_get(con));
    EINA_LIST_FOREACH(e_shelf_list(), l, es)
      {
-	Eina_List *ll2;
-	E_Config_Shelf_Desk *sd;
+        Eina_List *ll2;
+        E_Config_Shelf_Desk *sd;
 
-	if (es->zone->container == con)
-	  {
-	     if (es->cfg->desk_show_mode)
-	       {
-		  EINA_LIST_FOREACH(es->cfg->desk_list, ll2, sd)
-		    {
-		       if (!sd) continue;
-		       if ((sd->x == desk->x) && (sd->y == desk->y))
-			 {
-			    OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, es->w, es->h,
-				     e_config->gadget_resist);
-			    break;
-			 }
-		    }
-	       }
-	     else
-	       {
-		  OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, es->w, es->h,
-			   e_config->gadget_resist);
-	       }
-	  }
+        if (es->zone->container == con)
+          {
+             if (es->cfg->desk_show_mode)
+               {
+                  EINA_LIST_FOREACH(es->cfg->desk_list, ll2, sd)
+                    {
+                       if (!sd) continue;
+                       if ((sd->x == desk->x) && (sd->y == desk->y))
+                         {
+                            OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, es->w, es->h,
+                                     e_config->gadget_resist);
+                            break;
+                         }
+                    }
+               }
+             else
+               {
+                  OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, es->w, es->h,
+                           e_config->gadget_resist);
+               }
+          }
      }
    if (rects)
      {
-	_e_resist_rects(rects,
-			px, py, pw, ph,
-			x, y, w, h,
-			rx, ry, rw, rh);
+        _e_resist_rects(rects,
+                        px, py, pw, ph,
+                        x, y, w, h,
+                        rx, ry, rw, rh);
 
-	E_FREE_LIST(rects, E_FREE);
+        E_FREE_LIST(rects, E_FREE);
      }
    return 1;
 }
 
 EAPI int
 e_resist_container_gadman_position(E_Container *con, Eina_List *skiplist __UNUSED__,
-				   int px, int py, int pw, int ph,
-				   int x, int y, int w, int h,
-				   int *rx, int *ry)
+                                   int px, int py, int pw, int ph,
+                                   int x, int y, int w, int h,
+                                   int *rx, int *ry)
 {
    Eina_List *l, *rects = NULL;
    E_Resist_Rect *r;
@@ -134,37 +134,37 @@ e_resist_container_gadman_position(E_Container *con, Eina_List *skiplist __UNUSE
 
    if (!e_config->use_resist)
      {
-	*rx = x;
-	*ry = y;
-	return 0;
+        *rx = x;
+        *ry = y;
+        return 0;
      }
 
    EINA_LIST_FOREACH(e_shelf_list(), l, es)
      {
-	if (es->zone->container == con)
-	  {
-	     OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, es->w, es->h,
-		      e_config->gadget_resist);
-	  }
+        if (es->zone->container == con)
+          {
+             OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, es->w, es->h,
+                      e_config->gadget_resist);
+          }
      }
 
    if (rects)
      {
-	_e_resist_rects(rects,
-			px, py, pw, ph,
-			x, y, w, h,
-			rx, ry, NULL, NULL);
+        _e_resist_rects(rects,
+                        px, py, pw, ph,
+                        x, y, w, h,
+                        rx, ry, NULL, NULL);
 
-	E_FREE_LIST(rects, E_FREE);
+        E_FREE_LIST(rects, E_FREE);
      }
    return 1;
 }
 
 static void
 _e_resist_rects(Eina_List *rects,
-		int px, int py, int pw, int ph,
-		int x, int y, int w, int h,
-		int *rx, int *ry, int *rw, int *rh)
+                int px, int py, int pw, int ph,
+                int x, int y, int w, int h,
+                int *rx, int *ry, int *rw, int *rh)
 {
    int dx, dy, dw, dh, d, pd;
    int resist_x = 0, resist_y = 0;
@@ -179,207 +179,208 @@ _e_resist_rects(Eina_List *rects,
 
    EINA_LIST_FOREACH(rects, l, r)
      {
-	if (E_SPANS_COMMON(r->y, r->h, y, h))
-	  {
-	     if (dx > 0)
-	       {
-		  /* moving right */
-		  if (r->resist_out)
-		    {
-		       /* check right edge of windows against left */
-		       d = x + w - (r->x + r->w);
-		       pd = px + pw - (r->x + r->w);
-		       if ((d > 0) && (pd <= 0) && (d <= r->v1))
-			 {
-			    if (-resist_x < d)
-			      resist_x = -d;
-			 }
-		    }
-		  else
-		    {
-		       /* check left edge of windows against right */
-		       d = r->x - (x + w);
-		       pd = r->x - (px + pw);
-		       if ((d < 0) && (pd >= 0) && (d >= -r->v1))
-			 {
-			    if (resist_x > d)
-			      resist_x = d;
-			 }
-		    }
-	       }
-	     else if (dx < 0)
-	       {
-		  /* moving left */
-		  if (r->resist_out)
-		    {
-		       /* check left edge of windows against right */
-		       d = r->x - x;
-		       pd = r->x - px;
-		       if ((d > 0) && (pd <= 0) && (d <= r->v1))
-			 {
-			    if (resist_x < d)
-			      {
-				 resist_x = d;
-				 resist_w = -d;
-			      }
-			 }
-		    }
-		  else
-		    {
-		       /* check right edge of windows against left */
-		       d = x - (r->x + r->w);
-		       pd = px - (r->x + r->w);
-		       if ((d < 0) && (pd >= 0) && (d >= -r->v1))
-			 {
-			    if (-resist_x > d)
-			    {
-			       resist_x = -d;
-			       resist_w = d;
-			    }
-			 }
-		    }
-	       }
-	     if ((dw > 0) && (dx == 0))
-	       {
-		  /* enlarging window by moving lower corner */
-		  if (r->resist_out)
-		    {
-		       /* check right edge of windows against left */
-		       d = x + w - (r->x + r->w);
-		       pd = px + pw - (r->x + r->w);
-		       if ((d > 0) && (pd <= 0) && (d <= r->v1))
-			 {
-			    if (-resist_w < d)
-			      resist_w = -d;
-			 }
-		    }
-		  else
-		    {
-		       /* check left edge of windows against right */
-		       d = r->x - (x + w);
-		       pd = r->x - (px + pw);
-		       if ((d < 0) && (pd >= 0) && (d >= -r->v1))
-			 {
-			    if (resist_w > d)
-			      resist_w = d;
-			 }
-		    }
-	       }
-	  }
-	if (E_SPANS_COMMON(r->x, r->w, x, w))
-	  {
-	     if (dy > 0)
-	       {
-		  /* moving down */
-		  if (r->resist_out)
-		    {
-		       /* check bottom edge of windows against top */
-		       d = y + h - (r->y + r->h);
-		       pd = py + ph - (r->y + r->h);
-		       if ((d > 0) && (pd <= 0) && (d <= r->v1))
-			 {
-			    if (-resist_y < d)
-			      resist_y = -d;
-			 }
-		    }
-		  else
-		    {
-		       /* check top edge of windows against bottom */
-		       d = r->y - (y + h);
-		       pd = r->y - (py + ph);
-		       if ((d < 0) && (pd >= 0) && (d >= -r->v1))
-			 {
-			    if (resist_y > d)
-			      resist_y = d;
-			 }
-		    }
-	       }
-	     else if (dy < 0)
-	       {
-		  /* moving up */
-		  if (r->resist_out)
-		    {
-		       /* check top edge of windows against bottom */
-		       d = r->y - y;
-		       pd = r->y - py;
-		       if ((d > 0) && (pd <= 0) && (d <= r->v1))
-			 {
-			    if (resist_y < d)
-			      {
-				 resist_y = d;
-				 resist_h = -d;
-			      }
-			 }
-		    }
-		  else
-		    {
-		       /* moving up - check bottom edge of windows against top */
-		       d = y - (r->y + r->h);
-		       pd = py - (r->y + r->h);
-		       if ((d < 0) && (pd >= 0) && (d >= -r->v1))
-			 {
-			    if (-resist_y > d)
-			      {
-				 resist_y = -d;
-				 resist_h = d;
-			      }
-			 }
-		    }
-	       }
-	     if ((dh > 0) && (dy == 0))
-	       {
-		  /* enlarging window by moving lower corner */
-		  if (r->resist_out)
-		    {
-		       /* check bottom edge of windows against top */
-		       d = y + h - (r->y + r->h);
-		       pd = py + ph - (r->y + r->h);
-		       if ((d > 0) && (pd <= 0) && (d <= r->v1))
-			 {
-			    if (-resist_h < d)
-			      resist_h = -d;
-			 }
-		    }
-		  else
-		    {
-		       /* check top edge of windows against bottom */
-		       d = r->y - (y + h);
-		       pd = r->y - (py + ph);
-		       if ((d < 0) && (pd >= 0) && (d >= -r->v1))
-			 {
-			    if (resist_h > d)
-			      resist_h = d;
-			 }
-		    }
-	       }
-	  }
+        if (E_SPANS_COMMON(r->y, r->h, y, h))
+          {
+             if (dx > 0)
+               {
+                  /* moving right */
+                  if (r->resist_out)
+                    {
+                       /* check right edge of windows against left */
+                       d = x + w - (r->x + r->w);
+                       pd = px + pw - (r->x + r->w);
+                       if ((d > 0) && (pd <= 0) && (d <= r->v1))
+                         {
+                            if (-resist_x < d)
+                              resist_x = -d;
+                         }
+                    }
+                  else
+                    {
+                       /* check left edge of windows against right */
+                       d = r->x - (x + w);
+                       pd = r->x - (px + pw);
+                       if ((d < 0) && (pd >= 0) && (d >= -r->v1))
+                         {
+                            if (resist_x > d)
+                              resist_x = d;
+                         }
+                    }
+               }
+             else if (dx < 0)
+               {
+                  /* moving left */
+                  if (r->resist_out)
+                    {
+                       /* check left edge of windows against right */
+                       d = r->x - x;
+                       pd = r->x - px;
+                       if ((d > 0) && (pd <= 0) && (d <= r->v1))
+                         {
+                            if (resist_x < d)
+                              {
+                                 resist_x = d;
+                                 resist_w = -d;
+                              }
+                         }
+                    }
+                  else
+                    {
+                       /* check right edge of windows against left */
+                       d = x - (r->x + r->w);
+                       pd = px - (r->x + r->w);
+                       if ((d < 0) && (pd >= 0) && (d >= -r->v1))
+                         {
+                            if (-resist_x > d)
+                              {
+                                 resist_x = -d;
+                                 resist_w = d;
+                              }
+                         }
+                    }
+               }
+             if ((dw > 0) && (dx == 0))
+               {
+                  /* enlarging window by moving lower corner */
+                  if (r->resist_out)
+                    {
+                       /* check right edge of windows against left */
+                       d = x + w - (r->x + r->w);
+                       pd = px + pw - (r->x + r->w);
+                       if ((d > 0) && (pd <= 0) && (d <= r->v1))
+                         {
+                            if (-resist_w < d)
+                              resist_w = -d;
+                         }
+                    }
+                  else
+                    {
+                       /* check left edge of windows against right */
+                       d = r->x - (x + w);
+                       pd = r->x - (px + pw);
+                       if ((d < 0) && (pd >= 0) && (d >= -r->v1))
+                         {
+                            if (resist_w > d)
+                              resist_w = d;
+                         }
+                    }
+               }
+          }
+        if (E_SPANS_COMMON(r->x, r->w, x, w))
+          {
+             if (dy > 0)
+               {
+                  /* moving down */
+                  if (r->resist_out)
+                    {
+                       /* check bottom edge of windows against top */
+                       d = y + h - (r->y + r->h);
+                       pd = py + ph - (r->y + r->h);
+                       if ((d > 0) && (pd <= 0) && (d <= r->v1))
+                         {
+                            if (-resist_y < d)
+                              resist_y = -d;
+                         }
+                    }
+                  else
+                    {
+                       /* check top edge of windows against bottom */
+                       d = r->y - (y + h);
+                       pd = r->y - (py + ph);
+                       if ((d < 0) && (pd >= 0) && (d >= -r->v1))
+                         {
+                            if (resist_y > d)
+                              resist_y = d;
+                         }
+                    }
+               }
+             else if (dy < 0)
+               {
+                  /* moving up */
+                  if (r->resist_out)
+                    {
+                       /* check top edge of windows against bottom */
+                       d = r->y - y;
+                       pd = r->y - py;
+                       if ((d > 0) && (pd <= 0) && (d <= r->v1))
+                         {
+                            if (resist_y < d)
+                              {
+                                 resist_y = d;
+                                 resist_h = -d;
+                              }
+                         }
+                    }
+                  else
+                    {
+                       /* moving up - check bottom edge of windows against top */
+                       d = y - (r->y + r->h);
+                       pd = py - (r->y + r->h);
+                       if ((d < 0) && (pd >= 0) && (d >= -r->v1))
+                         {
+                            if (-resist_y > d)
+                              {
+                                 resist_y = -d;
+                                 resist_h = d;
+                              }
+                         }
+                    }
+               }
+             if ((dh > 0) && (dy == 0))
+               {
+                  /* enlarging window by moving lower corner */
+                  if (r->resist_out)
+                    {
+                       /* check bottom edge of windows against top */
+                       d = y + h - (r->y + r->h);
+                       pd = py + ph - (r->y + r->h);
+                       if ((d > 0) && (pd <= 0) && (d <= r->v1))
+                         {
+                            if (-resist_h < d)
+                              resist_h = -d;
+                         }
+                    }
+                  else
+                    {
+                       /* check top edge of windows against bottom */
+                       d = r->y - (y + h);
+                       pd = r->y - (py + ph);
+                       if ((d < 0) && (pd >= 0) && (d >= -r->v1))
+                         {
+                            if (resist_h > d)
+                              resist_h = d;
+                         }
+                    }
+               }
+          }
      }
    if (rx)
      {
-	if (dx != 0)
-	  *rx = x + resist_x;
-	else
-	  *rx = x;
+        if (dx != 0)
+          *rx = x + resist_x;
+        else
+          *rx = x;
      }
    if (ry)
      {
-	if (dy != 0)
-	  *ry = y + resist_y;
-	else
-	  *ry = y;
+        if (dy != 0)
+          *ry = y + resist_y;
+        else
+          *ry = y;
      }
    if (rw)
      {
-	if (dw != 0)
-	  *rw = w + resist_w;
-	else
-	  *rw = w;
+        if (dw != 0)
+          *rw = w + resist_w;
+        else
+          *rw = w;
      }
    if (rh)
      {
-	if (dh != 0)
-	  *rh = h + resist_h;
-	else
-	  *rh = h;
+        if (dh != 0)
+          *rh = h + resist_h;
+        else
+          *rh = h;
      }
 }
+