core + plugins: Make warpPointer() accept a CompScreen instead of CompDisplay.

Fixes crazy-cube-spinning and move-issues in multiscreen setups.


git-svn-id: file:///beryl/trunk@3701 d7aaf104-2d23-0410-ae22-9d23157bf5a3

1 files changed, 6 insertions, 5 deletions

diff --git a/beryl-plugins/src/rotate.c b/beryl-plugins/src/rotate.c
index 70edd33..e8125fa 100644
--- a/beryl-plugins/src/rotate.c
+++ b/beryl-plugins/src/rotate.c
@@ -1597,13 +1597,13 @@ static Bool rotateFlip(CompScreen * s, int direction)
 	{
 		//rotation to right
 		warpX = s->display->pointerX - s->width;
-		warpPointer(s->display, 10 - s->width, 0);
+		warpPointer(s, 10 - s->width, 0);
 		s->display->lastPointerX = warpX;
 	}
 	else
 	{
 		warpX = s->display->pointerX + s->width;
-		warpPointer(s->display, s->width - 10, 0);
+		warpPointer(s, s->width - 10, 0);
 		s->display->lastPointerX = warpX;
 	}
 
@@ -1731,14 +1731,14 @@ rotateEdgeFlip(CompScreen * s,
 		{
 			pointerDx = s->display->pointerX - s->display->lastPointerX;
 			warpX = s->display->pointerX + s->width;
-			warpPointer(s->display, s->width - 10, 0);
+			warpPointer(s, s->width - 10, 0);
 			s->display->lastPointerX = warpX - pointerDx;
 		}
 		else
 		{
 			pointerDx = s->display->pointerX - s->display->lastPointerX;
 			warpX = s->display->pointerX - s->width;
-			warpPointer(s->display, 10 - s->width, 0);
+			warpPointer(s, 10 - s->width, 0);
 			s->display->lastPointerX = warpX - pointerDx;
 		}
 
@@ -2009,7 +2009,8 @@ static void rotateHandleEvent(CompDisplay * d, XEvent * event)
 						s->width - 50
 						|| event->xmotion.y_root > s->height - 50)
 					{
-						warpPointer(d,
+						printf("WRAPPING! x: %d y: %d\n", d->pointerX, d->pointerY);
+						warpPointer(s,
 									(s->width /
 									 2) -
 									d->pointerX,