summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/wobbly.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/wobbly.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/wobbly.c')
-rw-r--r--beryl-plugins/src/wobbly.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/beryl-plugins/src/wobbly.c b/beryl-plugins/src/wobbly.c
index ad0e5ab..92693f8 100644
--- a/beryl-plugins/src/wobbly.c
+++ b/beryl-plugins/src/wobbly.c
@@ -839,14 +839,14 @@ findNextWestEdge (CompWindow * w, Object * object)
{
CompWindow *p;
- if (w->screen->useXinerama)
+ if (w->screen->nOutputDev > 1)
{
- for (i = 1; i <= w->screen->headsCount; i++)
+ for (i = 1; i <= w->screen->nOutputDev; i++)
{
- s = screenGetHeadAreaY (w->screen, i);
- e = screenGetHeadAreaY (w->screen,
+ s = screenGetOutputDevAreaY (w->screen, i);
+ e = screenGetOutputDevAreaY (w->screen,
i) +
- screenGetHeadAreaHeight (w->screen, i);
+ screenGetOutputDevAreaHeight (w->screen, i);
if (s > object->position.y)
{
@@ -866,7 +866,7 @@ findNextWestEdge (CompWindow * w, Object * object)
if (e < end)
end = e;
- v = screenGetHeadAreaX (w->screen, i);
+ v = screenGetOutputDevAreaX (w->screen, i);
if (v <= x)
{
if (v > v1)
@@ -969,14 +969,14 @@ findNextEastEdge (CompWindow * w, Object * object)
{
CompWindow *p;
- if (w->screen->useXinerama)
+ if (w->screen->nOutputDev > 1)
{
- for (i = 1; i <= w->screen->headsCount; i++)
+ for (i = 1; i <= w->screen->nOutputDev; i++)
{
- s = screenGetHeadAreaY (w->screen, i);
- e = screenGetHeadAreaY (w->screen,
+ s = screenGetOutputDevAreaY (w->screen, i);
+ e = screenGetOutputDevAreaY (w->screen,
i) +
- screenGetHeadAreaHeight (w->screen, i);
+ screenGetOutputDevAreaHeight (w->screen, i);
if (s > object->position.y)
{
@@ -996,9 +996,9 @@ findNextEastEdge (CompWindow * w, Object * object)
if (e < end)
end = e;
- v = screenGetHeadAreaX (w->screen,
+ v = screenGetOutputDevAreaX (w->screen,
i) +
- screenGetHeadAreaWidth (w->screen, i);
+ screenGetOutputDevAreaWidth (w->screen, i);
if (v >= x)
{
if (v < v1)
@@ -1101,14 +1101,14 @@ findNextNorthEdge (CompWindow * w, Object * object)
{
CompWindow *p;
- if (w->screen->useXinerama)
+ if (w->screen->nOutputDev > 1)
{
- for (i = 1; i <= w->screen->headsCount; i++)
+ for (i = 1; i <= w->screen->nOutputDev; i++)
{
- s = screenGetHeadAreaX (w->screen, i);
- e = screenGetHeadAreaX (w->screen,
+ s = screenGetOutputDevAreaX (w->screen, i);
+ e = screenGetOutputDevAreaX (w->screen,
i) +
- screenGetHeadAreaWidth (w->screen, i);
+ screenGetOutputDevAreaWidth (w->screen, i);
if (s > object->position.x)
{
@@ -1128,7 +1128,7 @@ findNextNorthEdge (CompWindow * w, Object * object)
if (e < end)
end = e;
- v = screenGetHeadAreaY (w->screen, i);
+ v = screenGetOutputDevAreaY (w->screen, i);
if (v <= y)
{
if (v > v1)
@@ -1231,14 +1231,14 @@ findNextSouthEdge (CompWindow * w, Object * object)
{
CompWindow *p;
- if (w->screen->useXinerama)
+ if (w->screen->nOutputDev > 1)
{
- for (i = 1; i <= w->screen->headsCount; i++)
+ for (i = 1; i <= w->screen->nOutputDev; i++)
{
- s = screenGetHeadAreaX (w->screen, i);
- e = screenGetHeadAreaX (w->screen,
+ s = screenGetOutputDevAreaX (w->screen, i);
+ e = screenGetOutputDevAreaX (w->screen,
i) +
- screenGetHeadAreaWidth (w->screen, i);
+ screenGetOutputDevAreaWidth (w->screen, i);
if (s > object->position.x)
{
@@ -1258,9 +1258,9 @@ findNextSouthEdge (CompWindow * w, Object * object)
if (e < end)
end = e;
- v = screenGetHeadAreaY (w->screen,
+ v = screenGetOutputDevAreaY (w->screen,
i) +
- screenGetHeadAreaHeight (w->screen, i);
+ screenGetOutputDevAreaHeight (w->screen, i);
if (v >= y)
{
if (v < v1)