diff --git a/src/ewins.c b/src/ewins.c index d65ee44f..4a5ef769 100644 --- a/src/ewins.c +++ b/src/ewins.c @@ -904,7 +904,7 @@ AddToFamily(EWin * ewin, Window xwin) GrabPointerSet(VRoot.win, ECSR_GRAB, 0); Mode.place.doing_manual = 1; EoSetFloating(ewin, 1); /* Causes reparenting to root */ - ActionMoveStart(ewin, 1, 0, 0); + ActionMoveStart(ewin, 0, 0); goto done; } else if (doslide) diff --git a/src/ewins.h b/src/ewins.h index a214dc26..abfd821d 100644 --- a/src/ewins.h +++ b/src/ewins.h @@ -446,13 +446,12 @@ void EwinSyncRequestWait(EWin * ewin); #endif /* moveresize.c */ -int ActionMoveStart(EWin * ewin, int grab, char constrained, - int nogroup); +int ActionMoveStart(EWin * ewin, char constrained, int nogroup); int ActionMoveEnd(EWin * ewin); int ActionMoveSuspend(void); int ActionMoveResume(void); void ActionMoveHandleMotion(void); -int ActionResizeStart(EWin * ewin, int grab, int hv); +int ActionResizeStart(EWin * ewin, int hv); int ActionResizeEnd(EWin * ewin); void ActionResizeHandleMotion(void); int ActionsSuspend(void); diff --git a/src/ewmh.c b/src/ewmh.c index 8d262996..d9ade891 100644 --- a/src/ewmh.c +++ b/src/ewmh.c @@ -1060,10 +1060,10 @@ EWMH_ProcessClientMessage(XClientMessageEvent * ev) case _NET_WM_MOVERESIZE_SIZE_BOTTOM: case _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT: case _NET_WM_MOVERESIZE_SIZE_LEFT: - ActionResizeStart(ewin, 1, MODE_RESIZE); + ActionResizeStart(ewin, MODE_RESIZE); break; case _NET_WM_MOVERESIZE_MOVE: - ActionMoveStart(ewin, 1, 0, 0); + ActionMoveStart(ewin, 0, 0); break; case _NET_WM_MOVERESIZE_SIZE_KEYBOARD: diff --git a/src/ipc.c b/src/ipc.c index edcbe3ae..1f4aa628 100644 --- a/src/ipc.c +++ b/src/ipc.c @@ -669,7 +669,7 @@ IpcWinop(const WinOp * wop, EWin * ewin, const char *prm) } if (!strcmp(param1, "ptr")) { - ActionMoveStart(ewin, 1, 0, Mode.nogroup); + ActionMoveStart(ewin, 0, Mode.nogroup); } else if (!strcmp(param1, "?")) { @@ -697,15 +697,15 @@ IpcWinop(const WinOp * wop, EWin * ewin, const char *prm) if (!strcmp(param1, "ptr")) { - ActionResizeStart(ewin, 1, MODE_RESIZE); + ActionResizeStart(ewin, MODE_RESIZE); } else if (!strcmp(param1, "ptr-h")) { - ActionResizeStart(ewin, 1, MODE_RESIZE_H); + ActionResizeStart(ewin, MODE_RESIZE_H); } else if (!strcmp(param1, "ptr-v")) { - ActionResizeStart(ewin, 1, MODE_RESIZE_V); + ActionResizeStart(ewin, MODE_RESIZE_V); } else if (!strcmp(param1, "?")) { diff --git a/src/moveresize.c b/src/moveresize.c index 70f31648..f148b00c 100644 --- a/src/moveresize.c +++ b/src/moveresize.c @@ -66,7 +66,7 @@ EwinShapeSet(EWin * ewin) } int -ActionMoveStart(EWin * ewin, int grab, char constrained, int nogroup) +ActionMoveStart(EWin * ewin, char constrained, int nogroup) { EWin **gwins; int i, num; @@ -79,8 +79,7 @@ ActionMoveStart(EWin * ewin, int grab, char constrained, int nogroup) 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.constrained = constrained; @@ -265,7 +264,7 @@ ActionMoveResume(void) } int -ActionResizeStart(EWin * ewin, int grab, int hv) +ActionResizeStart(EWin * ewin, int hv) { int x, y, w, h, ww, hh; unsigned int csr; @@ -385,8 +384,7 @@ ActionResizeStart(EWin * ewin, int grab, int hv) Mode_mr.win_w = ewin->client.w; Mode_mr.win_h = ewin->client.h; - if (grab) - GrabPointerSet(EoGetWin(ewin), csr, 1); + GrabPointerSet(EoGetWin(ewin), csr, 1); EwinShapeSet(ewin); ewin->state.show_coords = 1;