diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-25 21:47:10 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-25 21:47:10 +0000 |
| commit | b052486adb9ea26f37be120966eb60cd3ac3db2f (patch) | |
| tree | 916d84606a03b7caefbe86bfa9dc642a7092da72 /cfb/cfbpntwin.c | |
| parent | 14ab4ade74e946c09d633b15ab4d447d7b69ea29 (diff) | |
bug #230 Revert to Xinerama 1.1 In order to make a "quick" release it hasXORG-RELEASE-1-BASEXEVIE-MERGE
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. Too bad
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.
Diffstat (limited to 'cfb/cfbpntwin.c')
| -rw-r--r-- | cfb/cfbpntwin.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cfb/cfbpntwin.c b/cfb/cfbpntwin.c index 35b9dc017..e564b4d6e 100644 --- a/cfb/cfbpntwin.c +++ b/cfb/cfbpntwin.c @@ -1,4 +1,4 @@ -/* $XdotOrg: cfbpntwin.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ +/* $XdotOrg: xc/programs/Xserver/cfb/cfbpntwin.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */ /* $Xorg: cfbpntwin.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ /*********************************************************** @@ -60,9 +60,9 @@ SOFTWARE. #include "mi.h" #ifdef XINERAMA -#include "xinerama.h" -#include "xineramaSrv.h" -extern Bool noXineramaExtension; +#include "panoramiX.h" +#include "panoramiXsrv.h" +extern Bool noPanoramiXExtension; extern WindowPtr *WindowTable; #endif @@ -105,11 +105,11 @@ cfbPaintWindow(pWin, pRegion, what) int yorg = pWin->drawable.y; #endif #ifdef XINERAMA - if(!noXineramaExtension) { + if(!noPanoramiXExtension) { int index = pWin->drawable.pScreen->myNum; if(WindowTable[index] == pWin) { - xorg -= xineramaDataPtr[index].x; - yorg -= xineramaDataPtr[index].y; + xorg -= panoramiXdataPtr[index].x; + yorg -= panoramiXdataPtr[index].y; } } #endif @@ -163,11 +163,11 @@ cfbPaintWindow(pWin, pRegion, what) #endif #ifdef XINERAMA - if(!noXineramaExtension) { + if(!noPanoramiXExtension) { int index = pWin->drawable.pScreen->myNum; if(WindowTable[index] == pBgWin) { - xorg -= xineramaDataPtr[index].x; - yorg -= xineramaDataPtr[index].y; + xorg -= panoramiXdataPtr[index].x; + yorg -= panoramiXdataPtr[index].y; } } #endif |