summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/move.c
diff options
context:
space:
mode:
authorixce <ixce@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-07 14:35:05 +0000
committerixce <ixce@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-07 14:35:05 +0000
commit2535cf4620c82a0e136c04999e2fbf68b5bf672d (patch)
treec187e73db20fc53763e843ab4c45b60871e72c90 /beryl-plugins/src/move.c
parent9c407852d7708e7b5585ebbe5fe245d9f25c7ebd (diff)
downloadmarex-dev-2535cf4620c82a0e136c04999e2fbf68b5bf672d.tar.gz
marex-dev-2535cf4620c82a0e136c04999e2fbf68b5bf672d.tar.bz2
* Xinerama updates
git-svn-id: file:///beryl/trunk@538 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 a01a381..e32bdfd 100644
--- a/beryl-plugins/src/move.c
+++ b/beryl-plugins/src/move.c
@@ -258,7 +258,7 @@ moveHandleMotionEvent (CompScreen * s, int xRoot, int yRoot)
MOVE_DISPLAY (s->display);
w = md->w;
- head = screenGetHead (s, xRoot, yRoot, 0, 0);
+ head = screenGetOutputDev (s, xRoot, yRoot, 0, 0);
md->x += xRoot - lastPointerX;
md->y += yRoot - lastPointerY;
@@ -275,9 +275,9 @@ moveHandleMotionEvent (CompScreen * s, int xRoot, int yRoot)
dy = md->y;
max =
- screenGetHeadAreaY (s, head) + screenGetHeadAreaHeight (s,
+ screenGetOutputDevAreaY (s, head) + screenGetOutputDevAreaHeight (s,
head);
- min = screenGetHeadAreaY (s, head) + w->input.top;
+ min = screenGetOutputDevAreaY (s, head) + w->input.top;
if (md->opt[MOVE_DISPLAY_OPTION_CONSTRAIN_Y_TOP].value.b)
{
@@ -328,7 +328,7 @@ moveHandleMotionEvent (CompScreen * s, int xRoot, int yRoot)
maximizeWindow (w, ms->origState);
- wy = screenGetHeadAreaY (s,
+ wy = screenGetOutputDevAreaY (s,
head) +
(w->input.top >> 1);
wy += w->sizeHints.height_inc >> 1;
@@ -343,9 +343,9 @@ moveHandleMotionEvent (CompScreen * s, int xRoot, int yRoot)
if (w->state & CompWindowStateMaximizedVertMask)
{
- min = screenGetHeadAreaY (s, head) + w->input.top;
+ min = screenGetOutputDevAreaY (s, head) + w->input.top;
max =
- screenGetHeadAreaY (s, head) + screenGetHeadAreaHeight (s,
+ screenGetOutputDevAreaY (s, head) + screenGetOutputDevAreaHeight (s,
head)
- w->input.bottom - w->attrib.height -
w->attrib.border_width * 2;
@@ -361,9 +361,9 @@ moveHandleMotionEvent (CompScreen * s, int xRoot, int yRoot)
if (w->attrib.x > s->width || w->attrib.x + w->width < 0)
return;
- min = screenGetHeadAreaX (s, head) + w->input.left;
+ min = screenGetOutputDevAreaX (s, head) + w->input.left;
max =
- screenGetHeadAreaX (s, head) + screenGetHeadAreaWidth (s,
+ screenGetOutputDevAreaX (s, head) + screenGetOutputDevAreaWidth (s,
head)
- w->input.right - w->attrib.width -
w->attrib.border_width * 2;