summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/place.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/place.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/place.c')
-rw-r--r--beryl-plugins/src/place.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/beryl-plugins/src/place.c b/beryl-plugins/src/place.c
index 13538bd..a0ad00b 100644
--- a/beryl-plugins/src/place.c
+++ b/beryl-plugins/src/place.c
@@ -786,7 +786,7 @@ placeWindow (CompWindow * window, int x, int y, int *new_x, int *new_y)
if (window->state & (CompWindowStateMaximizedVertMask |
CompWindowStateMaximizedHorzMask))
{
- if (!window->screen->useXinerama)
+ if (window->screen->nOutputDev == 1)
{
if (window->state & CompWindowStateMaximizedVertMask)
y = work_area.y + window->input.top;
@@ -796,14 +796,14 @@ placeWindow (CompWindow * window, int x, int y, int *new_x, int *new_y)
}
else
{
- int head = screenGetHeadForWindow (window);
+ int head = screenGetOutputDevForWindow (window);
if (window->state & CompWindowStateMaximizedVertMask)
- y = screenGetHeadAreaY (window->screen,
+ y = screenGetOutputDevAreaY (window->screen,
head) + window->input.top;
if (window->state & CompWindowStateMaximizedHorzMask)
- x = screenGetHeadAreaX (window->screen,
+ x = screenGetOutputDevAreaX (window->screen,
head) + window->input.left;
}
@@ -930,10 +930,10 @@ placeWindow (CompWindow * window, int x, int y, int *new_x, int *new_y)
x = (w - window->width) / 2;
y = (h - window->height) / 2;
*/
- head = screenGetCurrentHead (window->screen);
+ head = screenGetCurrentOutputDev (window->screen);
- w = screenGetHeadAreaWidth (window->screen, head);
- h = screenGetHeadAreaHeight (window->screen, head);
+ w = screenGetOutputDevAreaWidth (window->screen, head);
+ h = screenGetOutputDevAreaHeight (window->screen, head);
x = (w - window->width) / 2;
y = (h - window->height) / 2;
@@ -1081,7 +1081,7 @@ placeWindow (CompWindow * window, int x, int y, int *new_x, int *new_y)
}
done_no_x_constraints:
- if (!window->screen->useXinerama)
+ if (window->screen->nOutputDev == 1)
{
if (y + window->height + window->input.bottom >
work_area.y + work_area.height)
@@ -1093,19 +1093,19 @@ placeWindow (CompWindow * window, int x, int y, int *new_x, int *new_y)
}
else
{
- int head = screenGetHeadForWindow (window);
+ int head = screenGetOutputDevForWindow (window);
if (y + window->height + window->input.bottom >
- screenGetHeadAreaY (window->screen, head) +
- screenGetHeadAreaHeight (window->screen, head))
- y = screenGetHeadAreaY (window->screen,
+ screenGetOutputDevAreaY (window->screen, head) +
+ screenGetOutputDevAreaHeight (window->screen, head))
+ y = screenGetOutputDevAreaY (window->screen,
head) +
- screenGetHeadAreaHeight (window->screen,
+ screenGetOutputDevAreaHeight (window->screen,
head) - window->height -
window->input.bottom;
- if (y - window->input.top < screenGetHeadAreaY (window->screen, head))
- y = screenGetHeadAreaY (window->screen, head) + window->input.top;
+ if (y - window->input.top < screenGetOutputDevAreaY (window->screen, head))
+ y = screenGetOutputDevAreaY (window->screen, head) + window->input.top;
}