summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/move.c
diff options
context:
space:
mode:
authorquinn <quinn@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-27 18:52:48 +0000
committerquinn <quinn@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-27 18:52:48 +0000
commit6405a5f5f4d09b17dff403429c0f0077fe8f1c71 (patch)
tree47921008430b433cac4c83e519d9bab187730436 /beryl-plugins/src/move.c
parentc344fb07b194b4ac88d1cf9f78901f36d292c9cb (diff)
downloadmarex-dev-6405a5f5f4d09b17dff403429c0f0077fe8f1c71.tar.gz
marex-dev-6405a5f5f4d09b17dff403429c0f0077fe8f1c71.tar.bz2
MAJOR CODE CLEANUP
beryl no longer uses any extern'd variables, and has get() functions for the things that can't be static const'd git-svn-id: file:///beryl/trunk@837 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/move.c')
-rw-r--r--beryl-plugins/src/move.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/beryl-plugins/src/move.c b/beryl-plugins/src/move.c
index 52bc37b..cc40244 100644
--- a/beryl-plugins/src/move.c
+++ b/beryl-plugins/src/move.c
@@ -174,8 +174,8 @@ moveInitiate (CompDisplay * d,
md->x = 0;
md->y = 0;
- lastPointerX = x;
- lastPointerY = y;
+ d->lastPointerX = x;
+ d->lastPointerY = y;
ms->origState = w->state;
@@ -201,7 +201,7 @@ moveInitiate (CompDisplay * d,
xRoot = w->attrib.x + (w->width / 2);
yRoot = w->attrib.y + (w->height / 2);
- warpPointer (d, xRoot - pointerX, yRoot - pointerY);
+ warpPointer (d, xRoot - d->pointerX, yRoot - d->pointerY);
}
}
}
@@ -260,8 +260,8 @@ moveHandleMotionEvent (CompScreen * s, int xRoot, int yRoot)
w = md->w;
head = screenGetOutputDev (s, xRoot, yRoot, 0, 0);
- md->x += xRoot - lastPointerX;
- md->y += yRoot - lastPointerY;
+ md->x += xRoot - s->display->lastPointerX;
+ md->y += yRoot - s->display->lastPointerY;
if (w->type & CompWindowTypeFullscreenMask)
{
@@ -333,7 +333,7 @@ moveHandleMotionEvent (CompScreen * s, int xRoot, int yRoot)
(w->input.top >> 1);
wy += w->sizeHints.height_inc >> 1;
- warpPointer (s->display, 0, wy - pointerY);
+ warpPointer (s->display, 0, wy - s->display->pointerY);
return;
}
@@ -434,13 +434,13 @@ moveHandleEvent (CompDisplay * d, XEvent * event)
case MotionNotify:
s = findScreenAtDisplay (d, event->xmotion.root);
if (s)
- moveHandleMotionEvent (s, pointerX, pointerY);
+ moveHandleMotionEvent (s, d->pointerX, d->pointerY);
break;
case EnterNotify:
case LeaveNotify:
s = findScreenAtDisplay (d, event->xcrossing.root);
if (s)
- moveHandleMotionEvent (s, pointerX, pointerY);
+ moveHandleMotionEvent (s, d->pointerX, d->pointerY);
break;
case ClientMessage:
if (event->xclient.message_type == d->wmMoveResizeAtom)