summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/resize.c
diff options
context:
space:
mode:
authorkristian <kristian@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-02-06 16:52:47 +0000
committerkristian <kristian@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-02-06 16:52:47 +0000
commit673935ed3726de35cd4da1209c4970e673693968 (patch)
treee853790548fcbe9088fabf93c351d473cc7f75c8 /beryl-plugins/src/resize.c
parente7ef36d9eb01d3cb22dce8387e013cbc8f1b1eab (diff)
downloadmarex-dev-673935ed3726de35cd4da1209c4970e673693968.tar.gz
marex-dev-673935ed3726de35cd4da1209c4970e673693968.tar.bz2
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
Diffstat (limited to 'beryl-plugins/src/resize.c')
-rw-r--r--beryl-plugins/src/resize.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/beryl-plugins/src/resize.c b/beryl-plugins/src/resize.c
index e1f6b73..b4918dd 100644
--- a/beryl-plugins/src/resize.c
+++ b/beryl-plugins/src/resize.c
@@ -381,7 +381,7 @@ static void resizeUpdateWindowSize(CompDisplay * d, int dx, int dy)
else if (rd->mask & ResizeUpMask)
pointerAdjustY = h - new_height;
- warpPointer(d, pointerAdjustX, pointerAdjustY);
+ warpPointer(rd->w->screen, pointerAdjustX, pointerAdjustY);
}
dx -= new_width - w;
@@ -562,7 +562,7 @@ resizeInitiate(CompDisplay * d,
{
x = w->attrib.x + (w->width / 2);
y = w->attrib.y + (w->height / 2);
- warpPointer(d, x - d->pointerX, y - d->pointerY);
+ warpPointer(w->screen, x - d->pointerX, y - d->pointerY);
}
else if ((mods & WARP_IGNORE_MASK) == mods_sought &&
button == button_sought &&
@@ -575,7 +575,7 @@ resizeInitiate(CompDisplay * d,
y = w->attrib.y - w->input.top +
((mask & ResizeUpMask) ? 0 : rd->height +
w->input.top + w->input.bottom);
- warpPointer(d, x - d->pointerX, y - d->pointerY);
+ warpPointer(w->screen, x - d->pointerX, y - d->pointerY);
}
rd->xdelta = (x - rd->currentX);
@@ -709,7 +709,7 @@ static void resizeHandleKeyEvent(CompScreen * s, KeyCode keycode)
if (rd->mask & ResizeDownMask)
rd->ydelta = rd->height - rd->ydelta;
- warpPointer(s->display,
+ warpPointer(s,
x - s->display->pointerX,
y - s->display->pointerY);
updateScreenGrab(s, rs->grabIndex, rs->cursor[i]);