e_resist: remove e_resist

It is deprecated.

Change-Id: Id1f1ce176ad5cc3565a7c1d572103139c09fa6ec

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 611b1a3..98fe340 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -70,7 +70,6 @@ src/bin/e_plane.h \
 src/bin/e_pointer.h \
 src/bin/e_prefix.h \
 src/bin/e_plane_renderer.h \
-src/bin/e_resist.h \
 src/bin/e_scale.h \
 src/bin/e_screensaver.h \
 src/bin/e_signals.h \
@@ -189,7 +188,6 @@ src/bin/e_plane.c \
 src/bin/e_pointer.c \
 src/bin/e_prefix.c \
 src/bin/e_plane_renderer.c \
-src/bin/e_resist.c \
 src/bin/e_scale.c \
 src/bin/e_screensaver.c \
 src/bin/e_signals.c \

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 5a4154b..da148fa 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -1577,8 +1577,7 @@ _e_client_moveinfo_gather(E_Client *ec, const char *source)
 static void
 _e_client_move_handle(E_Client *ec)
 {
-   int x, y, new_x, new_y;
-   int new_w, new_h;
+   int x, y;
    Eina_List *skiplist = NULL;
 
    if ((ec->moveinfo.down.button >= 1) && (ec->moveinfo.down.button <= 3))
@@ -1595,25 +1594,17 @@ _e_client_move_handle(E_Client *ec)
         y = ec->moveinfo.down.y +
            (ec->mouse.current.my - ec->moveinfo.down.my);
      }
-   e_comp_object_frame_xy_adjust(ec->frame, x, y, &new_x, &new_y);
-
-   skiplist = eina_list_append(skiplist, ec);
-   e_resist_client_position(skiplist,
-                            ec->x, ec->y, ec->w, ec->h,
-                            x, y, ec->w, ec->h,
-                            &new_x, &new_y, &new_w, &new_h);
-   eina_list_free(skiplist);
 
    if (e_config->screen_limits == E_CLIENT_OFFSCREEN_LIMIT_ALLOW_NONE)
-     _e_client_stay_within_canvas(ec, x, y, &new_x, &new_y);
+     _e_client_stay_within_canvas(ec, x, y, &x, &y);
 
    if (ec->floating)
-     _e_client_stay_within_canvas_margin(ec, x, y, &new_x, &new_y);
+     _e_client_stay_within_canvas_margin(ec, x, y, &x, &y);
 
    ec->shelf_fix.x = 0;
    ec->shelf_fix.y = 0;
    ec->shelf_fix.modified = 0;
-   evas_object_move(ec->frame, new_x, new_y);
+   evas_object_move(ec->frame, x, y);
 
    if (e_client_transform_core_enable_get(ec))
      {
@@ -1733,7 +1724,6 @@ _e_client_resize_handle(E_Client *ec)
    int tw, th;
    int trans_x = 0, trans_y = 0;
    int trans_w = 0, trans_h = 0;
-   Eina_List *skiplist = NULL;
 
    if (ec->transformed)
      {
@@ -1805,15 +1795,10 @@ _e_client_resize_handle(E_Client *ec)
        (ec->resize_mode == E_POINTER_RESIZE_TR))
      y += (th - h);
 
-   skiplist = eina_list_append(skiplist, ec);
-   e_resist_client_position(skiplist,
-                                      ec->x, ec->y, ec->w, ec->h,
-                                      x, y, w, h,
-                                      &new_x, &new_y, &new_w, &new_h);
-   eina_list_free(skiplist);
-
-   w = new_w;
-   h = new_h;
+   new_x = x;
+   new_y = y;
+   new_w = w;
+   new_y = y;
    if (e_config->screen_limits == E_CLIENT_OFFSCREEN_LIMIT_ALLOW_NONE)
      {
         if (ec->zone)

diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 8cd570a..b55de9a 100644 (file)
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -15,7 +15,6 @@
 #include "e_module.h"
 #include "e_focus.h"
 #include "e_place.h"
-#include "e_resist.h"
 #include "e_signals.h"
 #include "e_layout.h"
 #include "e_theme.h"

diff --git a/src/bin/e_resist.c b/src/bin/e_resist.c
deleted file mode 100644 (file)
index 051367f..0000000
--- a/src/bin/e_resist.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "e.h"
-
-typedef struct _E_Resist_Rect E_Resist_Rect;
-
-struct _E_Resist_Rect
-{
-   int x, y, w, h;
-   int v1;
-   int resist_out;
-};
-
-E_API int
-e_resist_client_position(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)
-{
-   if (rx) *rx = x;
-   if (ry) *ry = y;
-   if (rw) *rw = w;
-   if (rh) *rh = h;
-
-   return 0;
-}
-
-E_API int
-e_resist_gadman_position(Eina_List *skiplist EINA_UNUSED,
-                                   int px, int py, int pw, int ph,
-                                   int x, int y, int w, int h,
-                                   int *rx, int *ry)
-{
-   if (rx) *rx = x;
-   if (ry) *ry = y;
-
-   return 0;
-}

diff --git a/src/bin/e_resist.h b/src/bin/e_resist.h
deleted file mode 100644 (file)
index 7774295..0000000
--- a/src/bin/e_resist.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_RESIST_H
-#define E_RESIST_H
-
-E_API int e_resist_client_position(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);
-E_API int e_resist_gadman_position(Eina_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry);
-
-#endif
-#endif