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))
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))
{
int tw, th;
int trans_x = 0, trans_y = 0;
int trans_w = 0, trans_h = 0;
- Eina_List *skiplist = NULL;
if (ec->transformed)
{
(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)
+++ /dev/null
-#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;
-}
+++ /dev/null
-#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