From: Enlightenment C. <no...@cv...> - 2007-01-12 19:41:35
|
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/src Modified Files: ewins.c ewins.h ewmh.c ipc.c moveresize.c Log Message: Remove unneeded grab parameter (we always grab). =================================================================== RCS file: /cvs/e/e16/e/src/ewins.c,v retrieving revision 1.185 retrieving revision 1.186 diff -u -3 -r1.185 -r1.186 --- ewins.c 27 Dec 2006 16:17:27 -0000 1.185 +++ ewins.c 13 Jan 2007 01:41:34 -0000 1.186 @@ -904,7 +904,7 @@ 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) =================================================================== RCS file: /cvs/e/e16/e/src/ewins.h,v retrieving revision 1.63 retrieving revision 1.64 diff -u -3 -r1.63 -r1.64 --- ewins.h 27 Dec 2006 16:17:27 -0000 1.63 +++ ewins.h 13 Jan 2007 01:41:34 -0000 1.64 @@ -446,13 +446,12 @@ #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); =================================================================== RCS file: /cvs/e/e16/e/src/ewmh.c,v retrieving revision 1.108 retrieving revision 1.109 diff -u -3 -r1.108 -r1.109 --- ewmh.c 26 Nov 2006 11:30:58 -0000 1.108 +++ ewmh.c 13 Jan 2007 01:41:34 -0000 1.109 @@ -1060,10 +1060,10 @@ 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: =================================================================== RCS file: /cvs/e/e16/e/src/ipc.c,v retrieving revision 1.285 retrieving revision 1.286 diff -u -3 -r1.285 -r1.286 --- ipc.c 26 Nov 2006 17:10:40 -0000 1.285 +++ ipc.c 13 Jan 2007 01:41:34 -0000 1.286 @@ -669,7 +669,7 @@ } if (!strcmp(param1, "ptr")) { - ActionMoveStart(ewin, 1, 0, Mode.nogroup); + ActionMoveStart(ewin, 0, Mode.nogroup); } else if (!strcmp(param1, "?")) { @@ -697,15 +697,15 @@ 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, "?")) { =================================================================== RCS file: /cvs/e/e16/e/src/moveresize.c,v retrieving revision 1.72 retrieving revision 1.73 diff -u -3 -r1.72 -r1.73 --- moveresize.c 26 Nov 2006 17:10:40 -0000 1.72 +++ moveresize.c 13 Jan 2007 01:41:34 -0000 1.73 @@ -66,7 +66,7 @@ } 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 @@ 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 @@ } 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 @@ 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; |