diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-03-02 19:00:06 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-03-02 19:00:06 +0000 |
| commit | 7557d4da10cc482fcec40acadf7744b04c1615a0 (patch) | |
| tree | a2ab77fba25e1caa66c653ea1d329fd8fd5537a9 | |
| parent | 215a13aa8f537dcb62b0a2f6d335901ee47e9e9b (diff) | |
bug #230 Revert to Xinerama 1.1 In order to make a "quick" release it has
been decided that the priority is to preserve the server's internal
API/ABI so that third-party drivers that depend on symbols like
noPanoramiXExtension, etc., would not need to be recompiled. Toobad gcc
on Linux doesn't support ELF's weak symbols as that would have been a
reasonable solution for preserving the ABI. N.B.: While symbols, i.e.
functions and variables revert to the old name, I did not revert build
names, i.e. -DXINERAMA, to the old -DPANORAMIX. There was no need, and
it's just a build issue that has no impact on the binary output of the
build.
| -rw-r--r-- | miext/rootless/safeAlpha/safeAlphaWindow.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/miext/rootless/safeAlpha/safeAlphaWindow.c b/miext/rootless/safeAlpha/safeAlphaWindow.c index 381380e50..252124f3f 100644 --- a/miext/rootless/safeAlpha/safeAlphaWindow.c +++ b/miext/rootless/safeAlpha/safeAlphaWindow.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.1.4.1 2003/12/18 19:29:15 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.1.4.2 2004/02/23 21:37:25 kaleb Exp $ */ /* * Specialized window functions to protect the alpha channel */ @@ -39,8 +39,8 @@ #include "rootlessCommon.h" #ifdef XINERAMA -#include "xinerama.h" -#include "xineramaSrv.h" +#include "panoramiX.h" +#include "panoramiXsrv.h" #endif /* @@ -70,13 +70,13 @@ SafeAlphaFillRegionTiled( FbBits planeMask; #ifdef XINERAMA - if(!noXineramaExtension) + if(!noPanoramiXExtension) { int index = pDrawable->pScreen->myNum; if(&WindowTable[index]->drawable == pDrawable) { - xRot -= xineramaDataPtr[index].x; - yRot -= xineramaDataPtr[index].y; + xRot -= panoramiXdataPtr[index].x; + yRot -= panoramiXdataPtr[index].y; } } #endif |