summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/splash.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/splash.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/splash.c')
-rw-r--r--beryl-plugins/src/splash.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/beryl-plugins/src/splash.c b/beryl-plugins/src/splash.c
index 7a24156..6719dad 100644
--- a/beryl-plugins/src/splash.c
+++ b/beryl-plugins/src/splash.c
@@ -469,14 +469,14 @@ splashPaintScreen (CompScreen * s, const ScreenPaintAttrib * sa,
enableTexture (s, &ss->back_img, COMP_TEXTURE_FILTER_GOOD);
- if (s->useXinerama)
+ if (s->nOutputDev > 1)
{
- head = screenGetCurrentHead (s);
- x = (screenGetHeadAreaWidth (s, head) - ss->backSize[0]) / 2;
- y = (screenGetHeadAreaHeight (s, head) - ss->backSize[1]) / 2;
+ head = screenGetCurrentOutputDev (s);
+ x = (screenGetOutputDevAreaWidth (s, head) - ss->backSize[0]) / 2;
+ y = (screenGetOutputDevAreaHeight (s, head) - ss->backSize[1]) / 2;
- x += screenGetHeadAreaX (s, head);
- y += screenGetHeadAreaY (s, head);
+ x += screenGetOutputDevAreaX (s, head);
+ y += screenGetOutputDevAreaY (s, head);
}
else
{
@@ -517,14 +517,14 @@ splashPaintScreen (CompScreen * s, const ScreenPaintAttrib * sa,
}
glEnd ();
- if (s->useXinerama)
+ if (s->nOutputDev > 1)
{
- head = screenGetCurrentHead (s);
- x = (screenGetHeadAreaWidth (s, head) - ss->backSize[0]) / 2;
- y = (screenGetHeadAreaHeight (s, head) - ss->backSize[1]) / 2;
+ head = screenGetCurrentOutputDev (s);
+ x = (screenGetOutputDevAreaWidth (s, head) - ss->backSize[0]) / 2;
+ y = (screenGetOutputDevAreaHeight (s, head) - ss->backSize[1]) / 2;
- x += screenGetHeadAreaX (s, head);
- y += screenGetHeadAreaY (s, head);
+ x += screenGetOutputDevAreaX (s, head);
+ y += screenGetOutputDevAreaY (s, head);
}
else
{
@@ -541,14 +541,14 @@ splashPaintScreen (CompScreen * s, const ScreenPaintAttrib * sa,
enableTexture (s, &ss->logo_img, COMP_TEXTURE_FILTER_GOOD);
int x, y, head;
- if (s->useXinerama)
+ if (s->nOutputDev > 1)
{
- head = screenGetCurrentHead (s);
- x = (screenGetHeadAreaWidth (s, head) - ss->logoSize[0]) / 2;
- y = (screenGetHeadAreaHeight (s, head) - ss->logoSize[1]) / 2;
+ head = screenGetCurrentOutputDev (s);
+ x = (screenGetOutputDevAreaWidth (s, head) - ss->logoSize[0]) / 2;
+ y = (screenGetOutputDevAreaHeight (s, head) - ss->logoSize[1]) / 2;
- x += screenGetHeadAreaX (s, head);
- y += screenGetHeadAreaY (s, head);
+ x += screenGetOutputDevAreaX (s, head);
+ y += screenGetOutputDevAreaY (s, head);
}
else
{