Hello everyone, this file is based on the src/moveresize.c that was
included in the Enlightenment-0.16.7-pre6.tar.gz package. I have added
lines 297-319 to catch a special case of window resizing. The way it
works is if the cursor is in a region next to
the edge of the screen but towards the middle of that edge, then
resizing will only be done in one direction. I have tested it and it
works well. Does anyone have any comments, and would it be possible
for this to be added to Enlightenment, if not hard coded then as a
configuration option?
Thanks,
Josh Holtrop
/*
* Copyright (C) 2000-2004 Carsten Haitzler, Geoff Harrison and various contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "E.h"
static EWin *mode_moveresize_ewin = NULL;
static int move_swapcoord_x = 0;
static int move_swapcoord_y = 0;
static int move_mode_real = 0;
int
ActionMoveStart(EWin * ewin, const void *params, char constrained, int nogroup)
{
EWin **gwins;
int i, num;
EDBUG(6, "DoMove");
if (!ewin || ewin->fixedpos)
EDBUG_RETURN(0);
mode_moveresize_ewin = ewin;
move_mode_real = Conf.movemode;
#if 0 /* Why do this? Let's see what happens if we don't :) */
if (((ewin->groups) || (ewin->has_transients)) && (Conf.movemode > 0))
Conf.movemode = 0;
#endif
if (Conf.movemode > 0)
{
FX_Pause();
GrabX();
}
SoundPlay("SOUND_MOVE_START");
UnGrabTheButtons();
GrabConfineThePointer(VRoot.win, ECSR_ACT_MOVE);
Mode.mode = MODE_MOVE_PENDING;
Mode.constrained = constrained;
Mode.start_x = Mode.x;
Mode.start_y = Mode.y;
Mode.win_x = ewin->x;
Mode.win_y = ewin->y;
Mode.win_w = ewin->client.w;
Mode.win_h = ewin->client.h;
gwins = ListWinGroupMembersForEwin(ewin, ACTION_MOVE, nogroup
|| Mode.move.swap, &num);
for (i = 0; i < num; i++)
{
#if 0
gwins[i]->floating = 1; /* Reparent to root always */
#endif
FloatEwinAt(gwins[i], gwins[i]->x, gwins[i]->y);
#if 0 /* Will never get here */
if (Mode.mode == MODE_MOVE)
DrawEwinShape(gwins[i], Conf.movemode, gwins[i]->x, gwins[i]->y,
gwins[i]->client.w, gwins[i]->client.h, 0);
#endif
/* This shouldn't be necessary ... will figure it out some other time */
gwins[i]->shape_x = gwins[i]->x;
gwins[i]->shape_y = gwins[i]->y;
}
Efree(gwins);
move_swapcoord_x = ewin->x;
move_swapcoord_y = ewin->y;
EDBUG_RETURN(0);
params = NULL;
}
int
ActionMoveEnd(EWin * ewin)
{
EWin **gwins;
int d, wasresize = 0, num, i;
EDBUG(6, "doMoveEnd");
UnGrabTheButtons();
if (ewin && ewin != mode_moveresize_ewin)
return 0;
SoundPlay("SOUND_MOVE_STOP");
ewin = mode_moveresize_ewin;
if (!ewin)
{
if (Conf.movemode > 0)
UngrabX();
if (Mode.mode == MODE_MOVE)
ForceUpdatePagersForDesktop(desks.current);
Conf.movemode = move_mode_real;
EDBUG_RETURN(0);
}
d = DesktopAt(Mode.x, Mode.y);
gwins = ListWinGroupMembersForEwin(ewin, ACTION_MOVE, Mode.nogroup
|| Mode.move.swap, &num);
#if 1 /* Is this OK? */
if (Conf.movemode == 0)
for (i = 0; i < num; i++)
DetermineEwinFloat(gwins[i], 0, 0);
#endif
if (Mode.mode == MODE_MOVE)
{
wasresize = 1;
for (i = 0; i < num; i++)
DrawEwinShape(gwins[i], Conf.movemode,
gwins[i]->shape_x, gwins[i]->shape_y,
gwins[i]->client.w, gwins[i]->client.h, 2);
}
Mode.mode = MODE_NONE;
for (i = 0; i < num; i++)
{
if ((gwins[i]->floating) || (Conf.movemode > 0))
{
if (gwins[i]->floating)
MoveEwinToDesktopAt(gwins[i], d,
gwins[i]->shape_x - (desks.desk[d].x -
desks.desk[gwins[i]->
desktop].x),
gwins[i]->shape_y - (desks.desk[d].y -
desks.desk[gwins[i]->
desktop].
y));
else
MoveEwinToDesktopAt(gwins[i], d, gwins[i]->shape_x,
gwins[i]->shape_y);
gwins[i]->floating = 0;
}
RaiseEwin(gwins[i]);
ICCCM_Configure(gwins[i]);
}
StackDesktop(ewin->desktop); /* Restack to "un-float" */
XSync(disp, False);
if (Conf.movemode > 0)
{
FX_Pause();
UngrabX();
}
if (wasresize)
ForceUpdatePagersForDesktop(desks.current);
Efree(gwins);
Conf.movemode = move_mode_real;
Mode.nogroup = 0;
Mode.move.swap = 0;
if (Mode.have_place_grab)
{
Mode.have_place_grab = 0;
XUngrabPointer(disp, CurrentTime);
}
EwinUpdateAfterMoveResize(ewin, 0);
EDBUG_RETURN(0);
}
int
ActionMoveSuspend(void)
{
EWin *ewin, **lst;
int i, num;
ewin = mode_moveresize_ewin;
if (!ewin)
return 0;
if (Mode.mode == MODE_MOVE_PENDING)
return 0;
/* If non opaque undraw our boxes */
if (Conf.movemode > 0)
{
lst = ListWinGroupMembersForEwin(ewin, ACTION_MOVE, Mode.nogroup, &num);
for (i = 0; i < num; i++)
{
ewin = lst[i];
DrawEwinShape(ewin, Conf.movemode, ewin->shape_x, ewin->shape_y,
ewin->client.w, ewin->client.h, 3);
}
if (lst)
Efree(lst);
}
return 0;
}
int
ActionMoveResume(void)
{
EWin *ewin, **lst;
int i, num;
int x, y, ax, ay, fl;
ewin = mode_moveresize_ewin;
if (!ewin)
return 0;
fl = (Conf.movemode == 5) ? 4 : 0;
if (Mode.mode == MODE_MOVE_PENDING)
{
Mode.mode = MODE_MOVE;
fl = 0; /* This is the first time we draw it */
}
GetCurrentArea(&ax, &ay);
/* Redraw any windows that were in "move mode" */
lst = ListWinGroupMembersForEwin(ewin, ACTION_MOVE, Mode.nogroup, &num);
for (i = 0; i < num; i++)
{
ewin = lst[i];
if (!ewin->floating)
continue;
x = ewin->shape_x;
y = ewin->shape_y;
if (Mode.flipp)
{
x += Mode.x - Mode.px;
y += Mode.y - Mode.py;
}
DrawEwinShape(ewin, Conf.movemode, x, y,
ewin->client.w, ewin->client.h, fl);
}
if (lst)
Efree(lst);
return 0;
}
int
ActionResizeStart(EWin * ewin, const void *params, int hv)
{
int x, y, w, h;
EDBUG(6, "DoResize");
if (!ewin || ewin->shaded)
EDBUG_RETURN(0);
mode_moveresize_ewin = ewin;
if (Conf.resizemode > 0)
{
FX_Pause();
GrabX();
}
Mode.queue_up = 0;
SoundPlay("SOUND_RESIZE_START");
UnGrabTheButtons();
GrabConfineThePointer(VRoot.win, ECSR_ACT_RESIZE);
switch (hv)
{
case MODE_RESIZE:
Mode.mode = hv;
x = Mode.x - ewin->x;
y = Mode.y - ewin->y;
w = ewin->w >> 1;
h = ewin->h >> 1;
if ((x < w) && (y < h))
Mode.resize_detail = 0;
if ((x >= w) && (y < h))
Mode.resize_detail = 1;
if ((x < w) && (y >= h))
Mode.resize_detail = 2;
if ((x >= w) && (y >= h))
Mode.resize_detail = 3;
/* The following four if statements added on 07/22/04 by Josh Holtrop.
They allow strictly horizontal or vertical resizing when the
cursor is towards the middle of an edge of a window. */
if ((abs(x - w) < (w >> 1)) && (y < (h >> 1)))
{
Mode.mode = MODE_RESIZE_V;
Mode.resize_detail = 0;
}
else if ((abs(x - w) < (w >> 1)) && (y > (h + (h >> 1))))
{
Mode.mode = MODE_RESIZE_V;
Mode.resize_detail = 1;
}
else if ((abs(y - h) < (h >> 1)) && (x < (w >> 1)))
{
Mode.mode = MODE_RESIZE_H;
Mode.resize_detail = 0;
}
else if ((abs(y - h) < (h >> 1)) && (x > (w + (w >> 1))))
{
Mode.mode = MODE_RESIZE_H;
Mode.resize_detail = 1;
}
break;
case MODE_RESIZE_H:
Mode.mode = hv;
x = Mode.x - ewin->x;
w = ewin->w >> 1;
if (x < w)
Mode.resize_detail = 0;
else
Mode.resize_detail = 1;
break;
case MODE_RESIZE_V:
Mode.mode = hv;
y = Mode.y - ewin->y;
h = ewin->h >> 1;
if (y < h)
Mode.resize_detail = 0;
else
Mode.resize_detail = 1;
break;
}
Mode.start_x = Mode.x;
Mode.start_y = Mode.y;
Mode.win_x = ewin->x;
Mode.win_y = ewin->y;
Mode.win_w = ewin->client.w;
Mode.win_h = ewin->client.h;
DrawEwinShape(ewin, Conf.resizemode, ewin->x, ewin->y,
ewin->client.w, ewin->client.h, 0);
EDBUG_RETURN(0);
params = NULL;
}
int
ActionResizeEnd(EWin * ewin)
{
int i;
EDBUG(0, "doResizeEnd");
UnGrabTheButtons();
if (ewin && ewin != mode_moveresize_ewin)
return 0;
SoundPlay("SOUND_RESIZE_STOP");
ewin = mode_moveresize_ewin;
if (!ewin)
{
if (Conf.resizemode > 0)
UngrabX();
ForceUpdatePagersForDesktop(desks.current);
EDBUG_RETURN(0);
}
Mode.queue_up = DRAW_QUEUE_ENABLE;
Mode.mode = MODE_NONE;
DrawEwinShape(ewin, Conf.resizemode, ewin->shape_x, ewin->shape_y,
ewin->client.w, ewin->client.h, 2);
for (i = 0; i < ewin->border->num_winparts; i++)
ewin->bits[i].no_expose = 1;
ICCCM_Configure(ewin);
XSync(disp, False);
if (Conf.resizemode > 0)
{
FX_Pause();
UngrabX();
}
ForceUpdatePagersForDesktop(desks.current);
EwinUpdateAfterMoveResize(ewin, 1);
EDBUG_RETURN(0);
}
void
ActionMoveHandleMotion(void)
{
int dx, dy, dd;
EWin *ewin, **gwins, *ewin1;
int i, num;
int ndx, ndy;
int screen_snap_dist;
char jumpx, jumpy;
int min_dx, max_dx, min_dy, max_dy;
ewin = mode_moveresize_ewin;
if (!ewin)
return;
gwins = ListWinGroupMembersForEwin(ewin, ACTION_MOVE,
Mode.nogroup || Mode.move.swap, &num);
if (Mode.mode == MODE_MOVE_PENDING)
{
for (i = 0; i < num; i++)
{
ewin1 = gwins[i];
DrawEwinShape(ewin1, Conf.movemode, ewin1->x,
ewin1->y, ewin1->client.w, ewin1->client.h, 0);
}
Mode.mode = MODE_MOVE;
}
dx = Mode.x - Mode.px;
dy = Mode.y - Mode.py;
jumpx = 0;
jumpy = 0;
min_dx = dx;
min_dy = dy;
max_dx = dx;
max_dy = dy;
for (i = 0; i < num; i++)
{
ndx = dx;
ndy = dy;
/* make our ewin resist other ewins around the place */
SnapEwin(gwins[i], dx, dy, &ndx, &ndy);
if ((dx < 0) && (ndx <= 0))
{
if (ndx > min_dx)
min_dx = ndx;
if (ndx < max_dx)
max_dx = ndx;
}
else if (ndx >= 0)
{
if (ndx < min_dx)
min_dx = ndx;
if (ndx > max_dx)
max_dx = ndx;
}
if ((dy < 0) && (ndy <= 0))
{
if (ndy > min_dy)
min_dy = ndy;
if (ndy < max_dy)
max_dy = ndy;
}
else if (ndy >= 0)
{
if (ndy < min_dy)
min_dy = ndy;
if (ndy > max_dy)
max_dy = ndy;
}
}
if (min_dx == dx)
ndx = max_dx;
else
ndx = min_dx;
if (min_dy == dy)
ndy = max_dy;
else
ndy = min_dy;
screen_snap_dist =
Mode.constrained ? (VRoot.w + VRoot.h) : Conf.snap.screen_snap_dist;
for (i = 0; i < num; i++)
{
ewin1 = gwins[i];
/* jump out of snap horizontally */
dd = ewin1->req_x - ewin1->shape_x;
if (dd < 0)
dd = -dd;
if ((ndx != dx) &&
(((ewin1->shape_x == 0) &&
(dd > screen_snap_dist)) ||
((ewin1->shape_x == (VRoot.w - ewin1->w)) &&
(dd > screen_snap_dist)) ||
((ewin1->shape_x != 0) &&
(ewin1->shape_x != (VRoot.w - ewin1->w) &&
(dd > Conf.snap.edge_snap_dist)))))
{
jumpx = 1;
ndx = ewin1->req_x - ewin1->shape_x + dx;
}
/* jump out of snap vertically */
dd = ewin1->req_y - ewin1->shape_y;
if (dd < 0)
dd = -dd;
if ((ndy != dy) &&
(((ewin1->shape_y == 0) &&
(dd > screen_snap_dist)) ||
((ewin1->shape_y == (VRoot.h - ewin1->h)) &&
(dd > screen_snap_dist)) ||
((ewin1->shape_y != 0) &&
(ewin1->shape_y != (VRoot.h - ewin1->h) &&
(dd > Conf.snap.edge_snap_dist)))))
{
jumpy = 1;
ndy = ewin1->req_y - ewin1->shape_y + dy;
}
}
for (i = 0; i < num; i++)
{
ewin1 = gwins[i];
/* if its opaque move mode check to see if we have to float */
/* the window aboe all desktops (reparent to root) */
if (Conf.movemode == 0)
DetermineEwinFloat(ewin1, ndx, ndy);
/* draw the new position of the window */
DrawEwinShape(ewin1, Conf.movemode,
ewin1->shape_x + ndx, ewin1->shape_y + ndy,
ewin1->client.w, ewin1->client.h, 1);
/* if we didnt jump the window after a resist at the edge */
/* reset the requested x to be the prev. requested + delta */
/* if we did jump set requested to current shape position */
ewin1->req_x = (jumpx) ? ewin1->shape_x : ewin1->req_x + dx;
ewin1->req_y = (jumpy) ? ewin1->shape_y : ewin1->req_y + dy;
/* swapping of group member locations: */
if (Mode.move.swap && Conf.group_swapmove)
{
EWin **all_gwins, *ewin2;
int j, all_gwins_num;
all_gwins = ListWinGroupMembersForEwin(ewin, ACTION_NONE, 0,
&all_gwins_num);
for (j = 0; j < all_gwins_num; j++)
{
ewin2 = all_gwins[j];
if (ewin1 == ewin2)
continue;
/* check for sufficient overlap and avoid flickering */
if (((ewin1->shape_x >= ewin2->shape_x &&
ewin1->shape_x <= ewin2->shape_x +
ewin2->w / 2 && Mode.x <= Mode.px) ||
(ewin1->shape_x <= ewin2->shape_x &&
ewin1->shape_x + ewin1->w / 2 >=
ewin2->shape_x &&
Mode.x >= Mode.px)) &&
((ewin1->shape_y >= ewin2->shape_y
&& ewin1->shape_y <=
ewin2->shape_y + ewin2->h / 2
&& Mode.y <= Mode.py) || (ewin1->y <= ewin2->y
&& ewin1->shape_y +
ewin1->h / 2 >= ewin2->shape_y
&& Mode.y >= Mode.py)))
{
int tmp_swapcoord_x;
int tmp_swapcoord_y;
tmp_swapcoord_x = move_swapcoord_x;
tmp_swapcoord_y = move_swapcoord_y;
move_swapcoord_x = ewin2->shape_x;
move_swapcoord_y = ewin2->shape_y;
MoveEwin(ewin2, tmp_swapcoord_x, tmp_swapcoord_y);
break;
}
}
Efree(all_gwins);
}
}
Efree(gwins);
}
void
ActionResizeHandleMotion(void)
{
int pw, ph;
int x, y, w, h;
EWin *ewin;
ewin = mode_moveresize_ewin;
if (!ewin)
return;
switch (Mode.mode)
{
case MODE_RESIZE:
switch (Mode.resize_detail)
{
case 0:
pw = ewin->client.w;
ph = ewin->client.h;
w = Mode.win_w - (Mode.x - Mode.start_x);
h = Mode.win_h - (Mode.y - Mode.start_y);
x = Mode.win_x + (Mode.x - Mode.start_x);
y = Mode.win_y + (Mode.y - Mode.start_y);
ewin->client.w = w;
ewin->client.h = h;
ICCCM_MatchSize(ewin);
w = ewin->client.w;
h = ewin->client.h;
if (pw == ewin->client.w)
x = ewin->shape_x;
else
x = Mode.win_x + Mode.win_w - w;
if (ph == ewin->client.h)
y = ewin->shape_y;
else
y = Mode.win_y + Mode.win_h - h;
ewin->client.w = pw;
ewin->client.h = ph;
DrawEwinShape(ewin, Conf.resizemode, x, y, w, h, 1);
break;
case 1:
ph = ewin->client.h;
w = Mode.win_w + (Mode.x - Mode.start_x);
h = Mode.win_h - (Mode.y - Mode.start_y);
x = ewin->shape_x;
y = Mode.win_y + (Mode.y - Mode.start_y);
ewin->client.h = h;
ICCCM_MatchSize(ewin);
h = ewin->client.h;
if (ph == ewin->client.h)
y = ewin->shape_y;
else
y = Mode.win_y + Mode.win_h - h;
ewin->client.h = ph;
DrawEwinShape(ewin, Conf.resizemode, x, y, w, h, 1);
break;
case 2:
pw = ewin->client.w;
w = Mode.win_w - (Mode.x - Mode.start_x);
h = Mode.win_h + (Mode.y - Mode.start_y);
x = Mode.win_x + (Mode.x - Mode.start_x);
y = ewin->shape_y;
ewin->client.w = w;
ICCCM_MatchSize(ewin);
w = ewin->client.w;
if (pw == ewin->client.w)
x = ewin->shape_x;
else
x = Mode.win_x + Mode.win_w - w;
ewin->client.w = pw;
DrawEwinShape(ewin, Conf.resizemode, x, y, w, h, 1);
break;
case 3:
w = Mode.win_w + (Mode.x - Mode.start_x);
h = Mode.win_h + (Mode.y - Mode.start_y);
x = ewin->shape_x;
y = ewin->shape_y;
DrawEwinShape(ewin, Conf.resizemode, x, y, w, h, 1);
break;
default:
break;
}
break;
case MODE_RESIZE_H:
switch (Mode.resize_detail)
{
case 0:
pw = ewin->client.w;
w = Mode.win_w - (Mode.x - Mode.start_x);
h = ewin->client.h;
x = Mode.win_x + (Mode.x - Mode.start_x);
y = ewin->shape_y;
ewin->client.w = w;
ICCCM_MatchSize(ewin);
w = ewin->client.w;
if (pw == ewin->client.w)
x = ewin->shape_x;
else
x = Mode.win_x + Mode.win_w - w;
ewin->client.w = pw;
DrawEwinShape(ewin, Conf.resizemode, x, y, w, h, 1);
break;
case 1:
w = Mode.win_w + (Mode.x - Mode.start_x);
h = ewin->client.h;
x = ewin->shape_x;
y = ewin->shape_y;
DrawEwinShape(ewin, Conf.resizemode, x, y, w, h, 1);
break;
default:
break;
}
break;
case MODE_RESIZE_V:
switch (Mode.resize_detail)
{
case 0:
ph = ewin->client.h;
w = ewin->client.w;
h = Mode.win_h - (Mode.y - Mode.start_y);
x = ewin->shape_x;
y = Mode.win_y + (Mode.y - Mode.start_y);
ewin->client.h = h;
ICCCM_MatchSize(ewin);
h = ewin->client.h;
if (ph == ewin->client.h)
y = ewin->shape_y;
else
y = Mode.win_y + Mode.win_h - h;
ewin->client.h = ph;
DrawEwinShape(ewin, Conf.resizemode, x, y, w, h, 1);
break;
case 1:
w = ewin->client.w;
h = Mode.win_h + (Mode.y - Mode.start_y);
x = ewin->shape_x;
y = ewin->shape_y;
DrawEwinShape(ewin, Conf.resizemode, x, y, w, h, 1);
break;
default:
break;
}
break;
default:
break;
}
}
