Remove unneeded grab parameter (we always grab).
SVN revision: 27935
This commit is contained in:
parent
7214ef6c16
commit
056a824115
|
@ -904,7 +904,7 @@ AddToFamily(EWin * ewin, Window xwin)
|
||||||
GrabPointerSet(VRoot.win, ECSR_GRAB, 0);
|
GrabPointerSet(VRoot.win, ECSR_GRAB, 0);
|
||||||
Mode.place.doing_manual = 1;
|
Mode.place.doing_manual = 1;
|
||||||
EoSetFloating(ewin, 1); /* Causes reparenting to root */
|
EoSetFloating(ewin, 1); /* Causes reparenting to root */
|
||||||
ActionMoveStart(ewin, 1, 0, 0);
|
ActionMoveStart(ewin, 0, 0);
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
else if (doslide)
|
else if (doslide)
|
||||||
|
|
|
@ -446,13 +446,12 @@ void EwinSyncRequestWait(EWin * ewin);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* moveresize.c */
|
/* moveresize.c */
|
||||||
int ActionMoveStart(EWin * ewin, int grab, char constrained,
|
int ActionMoveStart(EWin * ewin, char constrained, int nogroup);
|
||||||
int nogroup);
|
|
||||||
int ActionMoveEnd(EWin * ewin);
|
int ActionMoveEnd(EWin * ewin);
|
||||||
int ActionMoveSuspend(void);
|
int ActionMoveSuspend(void);
|
||||||
int ActionMoveResume(void);
|
int ActionMoveResume(void);
|
||||||
void ActionMoveHandleMotion(void);
|
void ActionMoveHandleMotion(void);
|
||||||
int ActionResizeStart(EWin * ewin, int grab, int hv);
|
int ActionResizeStart(EWin * ewin, int hv);
|
||||||
int ActionResizeEnd(EWin * ewin);
|
int ActionResizeEnd(EWin * ewin);
|
||||||
void ActionResizeHandleMotion(void);
|
void ActionResizeHandleMotion(void);
|
||||||
int ActionsSuspend(void);
|
int ActionsSuspend(void);
|
||||||
|
|
|
@ -1060,10 +1060,10 @@ EWMH_ProcessClientMessage(XClientMessageEvent * ev)
|
||||||
case _NET_WM_MOVERESIZE_SIZE_BOTTOM:
|
case _NET_WM_MOVERESIZE_SIZE_BOTTOM:
|
||||||
case _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT:
|
case _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT:
|
||||||
case _NET_WM_MOVERESIZE_SIZE_LEFT:
|
case _NET_WM_MOVERESIZE_SIZE_LEFT:
|
||||||
ActionResizeStart(ewin, 1, MODE_RESIZE);
|
ActionResizeStart(ewin, MODE_RESIZE);
|
||||||
break;
|
break;
|
||||||
case _NET_WM_MOVERESIZE_MOVE:
|
case _NET_WM_MOVERESIZE_MOVE:
|
||||||
ActionMoveStart(ewin, 1, 0, 0);
|
ActionMoveStart(ewin, 0, 0);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case _NET_WM_MOVERESIZE_SIZE_KEYBOARD:
|
case _NET_WM_MOVERESIZE_SIZE_KEYBOARD:
|
||||||
|
|
|
@ -669,7 +669,7 @@ IpcWinop(const WinOp * wop, EWin * ewin, const char *prm)
|
||||||
}
|
}
|
||||||
if (!strcmp(param1, "ptr"))
|
if (!strcmp(param1, "ptr"))
|
||||||
{
|
{
|
||||||
ActionMoveStart(ewin, 1, 0, Mode.nogroup);
|
ActionMoveStart(ewin, 0, Mode.nogroup);
|
||||||
}
|
}
|
||||||
else if (!strcmp(param1, "?"))
|
else if (!strcmp(param1, "?"))
|
||||||
{
|
{
|
||||||
|
@ -697,15 +697,15 @@ IpcWinop(const WinOp * wop, EWin * ewin, const char *prm)
|
||||||
|
|
||||||
if (!strcmp(param1, "ptr"))
|
if (!strcmp(param1, "ptr"))
|
||||||
{
|
{
|
||||||
ActionResizeStart(ewin, 1, MODE_RESIZE);
|
ActionResizeStart(ewin, MODE_RESIZE);
|
||||||
}
|
}
|
||||||
else if (!strcmp(param1, "ptr-h"))
|
else if (!strcmp(param1, "ptr-h"))
|
||||||
{
|
{
|
||||||
ActionResizeStart(ewin, 1, MODE_RESIZE_H);
|
ActionResizeStart(ewin, MODE_RESIZE_H);
|
||||||
}
|
}
|
||||||
else if (!strcmp(param1, "ptr-v"))
|
else if (!strcmp(param1, "ptr-v"))
|
||||||
{
|
{
|
||||||
ActionResizeStart(ewin, 1, MODE_RESIZE_V);
|
ActionResizeStart(ewin, MODE_RESIZE_V);
|
||||||
}
|
}
|
||||||
else if (!strcmp(param1, "?"))
|
else if (!strcmp(param1, "?"))
|
||||||
{
|
{
|
||||||
|
|
|
@ -66,7 +66,7 @@ EwinShapeSet(EWin * ewin)
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
ActionMoveStart(EWin * ewin, int grab, char constrained, int nogroup)
|
ActionMoveStart(EWin * ewin, char constrained, int nogroup)
|
||||||
{
|
{
|
||||||
EWin **gwins;
|
EWin **gwins;
|
||||||
int i, num;
|
int i, num;
|
||||||
|
@ -79,8 +79,7 @@ ActionMoveStart(EWin * ewin, int grab, char constrained, int nogroup)
|
||||||
|
|
||||||
SoundPlay("SOUND_MOVE_START");
|
SoundPlay("SOUND_MOVE_START");
|
||||||
|
|
||||||
if (grab)
|
GrabPointerSet(EoGetWin(ewin), ECSR_ACT_MOVE, 1);
|
||||||
GrabPointerSet(EoGetWin(ewin), ECSR_ACT_MOVE, 1);
|
|
||||||
|
|
||||||
Mode.mode = MODE_MOVE_PENDING;
|
Mode.mode = MODE_MOVE_PENDING;
|
||||||
Mode.constrained = constrained;
|
Mode.constrained = constrained;
|
||||||
|
@ -265,7 +264,7 @@ ActionMoveResume(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
ActionResizeStart(EWin * ewin, int grab, int hv)
|
ActionResizeStart(EWin * ewin, int hv)
|
||||||
{
|
{
|
||||||
int x, y, w, h, ww, hh;
|
int x, y, w, h, ww, hh;
|
||||||
unsigned int csr;
|
unsigned int csr;
|
||||||
|
@ -385,8 +384,7 @@ ActionResizeStart(EWin * ewin, int grab, int hv)
|
||||||
Mode_mr.win_w = ewin->client.w;
|
Mode_mr.win_w = ewin->client.w;
|
||||||
Mode_mr.win_h = ewin->client.h;
|
Mode_mr.win_h = ewin->client.h;
|
||||||
|
|
||||||
if (grab)
|
GrabPointerSet(EoGetWin(ewin), csr, 1);
|
||||||
GrabPointerSet(EoGetWin(ewin), csr, 1);
|
|
||||||
|
|
||||||
EwinShapeSet(ewin);
|
EwinShapeSet(ewin);
|
||||||
ewin->state.show_coords = 1;
|
ewin->state.show_coords = 1;
|
||||||
|
|
Loading…
Reference in New Issue