summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/move.c
diff options
context:
space:
mode:
authortrappist <trappist@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-02-04 02:41:33 +0000
committertrappist <trappist@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-02-04 02:41:33 +0000
commitb400615c5784e2bd48a4b6f37b6723efd91ccfee (patch)
tree9f03e99e4feb47131e8f07dde1898e830b00ee8d /beryl-plugins/src/move.c
parent20f8e866ace4c94b5bf61598a270f299df271c08 (diff)
downloadmarex-dev-b400615c5784e2bd48a4b6f37b6723efd91ccfee.tar.gz
marex-dev-b400615c5784e2bd48a4b6f37b6723efd91ccfee.tar.bz2
Fix warnings in move. Patch by toggles. Closes #1165
git-svn-id: file:///beryl/trunk@3636 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/move.c')
-rw-r--r--beryl-plugins/src/move.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/beryl-plugins/src/move.c b/beryl-plugins/src/move.c
index 7ee3dad..94cfb40 100644
--- a/beryl-plugins/src/move.c
+++ b/beryl-plugins/src/move.c
@@ -337,15 +337,11 @@ static void moveHandleMotionEvent(CompScreen * s, int xRoot, int yRoot)
if (ms->grabIndex)
{
CompWindow *w;
- int dx, dy, head;
- XRectangle workArea;
+ int dx, dy;
MOVE_DISPLAY(s->display);
w = md->w;
- head = screenGetOutputDev(s, xRoot, yRoot, 0, 0);
- screenGetOutputDevWorkArea(s, head, &workArea);
-
md->x += xRoot - s->display->lastPointerX;
md->y += yRoot - s->display->lastPointerY;
@@ -391,7 +387,7 @@ static void moveHandleMotionEvent(CompScreen * s, int xRoot, int yRoot)
if (constrainBottom)
height += w->height + w->input.bottom;
}
- else if (constrainBottom)
+ else /* if (constrainBottom) redundant */
{
y = w->attrib.y + dy + w->height;
height = w->input.bottom ? w->input.bottom : 1;