summaryrefslogtreecommitdiff
path: root/hw/xfree86
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86')
-rw-r--r--hw/xfree86/common/xf86Config.c8
-rw-r--r--hw/xfree86/common/xf86DGA.c4
-rw-r--r--hw/xfree86/common/xf86Mode.c4
-rw-r--r--hw/xfree86/common/xf86RandR.c4
-rw-r--r--hw/xfree86/dixmods/extmod/modinit.h4
-rw-r--r--hw/xfree86/dri/dri.c6
-rw-r--r--hw/xfree86/loader/extsym.c20
-rw-r--r--hw/xfree86/xaa/xaaOverlay.c12
-rw-r--r--hw/xfree86/xaa/xaaPaintWin.c12
-rw-r--r--hw/xfree86/xf8_32bpp/cfbpntwin.c18
10 files changed, 46 insertions, 46 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index fc741e01e..d214163d5 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.277 2003/10/15 22:51:48 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 1.1.4.3 2003/12/18 19:29:13 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.277 2003/10/15 22:51:48 dawes Exp $ */
@@ -1060,13 +1060,13 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
#ifdef XINERAMA
from = X_DEFAULT;
- if (!noXineramaExtension)
+ if (!noPanoramiXExtension)
from = X_CMDLINE;
else if (xf86GetOptValBool(FlagOptions, FLAG_XINERAMA, &value)) {
- noXineramaExtension = !value;
+ noPanoramiXExtension = !value;
from = X_CONFIG;
}
- if (!noXineramaExtension)
+ if (!noPanoramiXExtension)
xf86Msg(from, "Xinerama: enabled\n");
#endif
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index dce27fa63..21552d485 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.47 2003/08/24 17:36:51 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.1.4.2 2003/12/18 19:29:13 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.47 2003/08/24 17:36:51 dawes Exp $ */
/*
* Copyright (c) 1998-2002 by The XFree86 Project, Inc.
@@ -141,7 +141,7 @@ DGAInit(
modes[i].num = i + 1;
#ifdef XINERAMA
- if(!noXineramaExtension)
+ if(!noPanoramiXExtension)
for(i = 0; i < num; i++)
modes[i].flags &= ~DGA_PIXMAP_AVAILABLE;
#endif
diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index 392229ce9..ab428e0b0 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.1.4.2 2003/12/18 19:29:13 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.69 2003/10/08 14:58:28 dawes Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -1683,7 +1683,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
#ifdef RANDR
if (!xf86Info.disableRandR
#ifdef XINERAMA
- && noXineramaExtension
+ && noPanoramiXExtension
#endif
)
validateAllDefaultModes = TRUE;
diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
index 165ddf771..d98f36f1c 100644
--- a/hw/xfree86/common/xf86RandR.c
+++ b/hw/xfree86/common/xf86RandR.c
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.1.4.2 2003/12/18 19:29:14 kaleb Exp $ */
/*
* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.8 2003/11/10 16:42:13 tsi Exp $
*
@@ -246,7 +246,7 @@ xf86RandRInit (ScreenPtr pScreen)
#ifdef XINERAMA
/* XXX disable RandR when using Xinerama */
- if (!noXineramaExtension)
+ if (!noPanoramiXExtension)
return TRUE;
#endif
if (xf86RandRGeneration != serverGeneration)
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index d909cb483..405f67b72 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.1.4.1 2003/12/18 19:29:12 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.2 2003/09/13 21:33:04 dawes Exp $ */
#ifndef INITARGS
@@ -137,7 +137,7 @@ extern void XpExtensionInit(INITARGS);
#endif
#if 1
-extern void XineramaExtensionInit(int argc, char *argv[]);
+extern void PanoramiXExtensionInit(int argc, char *argv[]);
#endif
#if 1
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 9d603d03e..f2a0561ad 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -67,7 +67,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "mipointer.h"
#if defined(XFree86LOADER) && !defined(XINERAMA)
-extern Bool noXineramaExtension;
+extern Bool noPanoramiXExtension;
#endif
static int DRIScreenPrivIndex = -1;
@@ -132,13 +132,13 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
#if defined(XINERAMA) && !defined(XFree86LOADER)
xineramaInCore = TRUE;
#elif defined(XFree86LOADER)
- if (xf86LoaderCheckSymbol("noXineramaExtension"))
+ if (xf86LoaderCheckSymbol("noPanoramiXExtension"))
xineramaInCore = TRUE;
#endif
#if defined(XINERAMA) || defined(XFree86LOADER)
if (xineramaInCore) {
- if (!noXineramaExtension) {
+ if (!noPanoramiXExtension) {
DRIDrvMsg(pScreen->myNum, X_WARNING,
"Direct rendering is not supported when Xinerama is enabled\n");
return FALSE;
diff --git a/hw/xfree86/loader/extsym.c b/hw/xfree86/loader/extsym.c
index 638911aa4..9423b8c83 100644
--- a/hw/xfree86/loader/extsym.c
+++ b/hw/xfree86/loader/extsym.c
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.1.4.2 2003/12/18 19:29:14 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.9 2003/10/15 16:29:03 dawes Exp $ */
/*
@@ -29,7 +29,7 @@
#include "sym.h"
#include "misc.h"
#ifdef XINERAMA
-#include "xinerama.h"
+#include "panoramiX.h"
#endif
#include "sleepuntil.h"
@@ -40,10 +40,10 @@ extern RESTYPE ShmSegType, ShmPixType;
#endif
#ifdef XINERAMA
-extern Bool noXineramaExtension;
-extern int XineramaNumScreens;
-extern XineramaData *xineramaDataPtr;
-extern XID *XineramaVisualTable;
+extern Bool noPanoramiXExtension;
+extern int PanoramiXNumScreens;
+extern PanoramiXData *panoramiXdataPtr;
+extern XID *PanoramiXVisualTable;
extern unsigned long XRT_WINDOW;
extern unsigned long XRT_PIXMAP;
extern unsigned long XRT_GC;
@@ -66,10 +66,10 @@ LOOKUP extLookupTab[] = {
#ifdef XINERAMA
SYMFUNC(XineramaRegisterConnectionBlockCallback)
SYMFUNC(XineramaDeleteResource)
- SYMVAR(noXineramaExtension)
- SYMVAR(XineramaNumScreens)
- SYMVAR(xineramaDataPtr)
- SYMVAR(XineramaVisualTable)
+ SYMVAR(noPanoramiXExtension)
+ SYMVAR(PanoramiXNumScreens)
+ SYMVAR(panoramiXdataPtr)
+ SYMVAR(PanoramiXVisualTable)
SYMVAR(XRT_WINDOW)
SYMVAR(XRT_PIXMAP)
SYMVAR(XRT_GC)
diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c
index 9fa1dec41..e08284879 100644
--- a/hw/xfree86/xaa/xaaOverlay.c
+++ b/hw/xfree86/xaa/xaaOverlay.c
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.1.4.2 2003/12/18 19:29:15 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.15 2003/11/10 18:22:41 tsi Exp $ */
#include "misc.h"
@@ -18,8 +18,8 @@
#include "mioverlay.h"
#ifdef XINERAMA
-#include "xinerama.h"
-#include "xineramaSrv.h"
+#include "panoramiX.h"
+#include "panoramiXsrv.h"
#endif
static void
@@ -168,11 +168,11 @@ XAAPaintWindow8_32(
yorg = pBgWin->drawable.y;
#ifdef XINERAMA
- if(!noXineramaExtension) {
+ if(!noPanoramiXExtension) {
int index = pScreen->myNum;
if(WindowTable[index] == pBgWin) {
- xorg -= xineramaDataPtr[index].x;
- yorg -= xineramaDataPtr[index].y;
+ xorg -= panoramiXdataPtr[index].x;
+ yorg -= panoramiXdataPtr[index].y;
}
}
#endif
diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c
index cb6beb77b..30f35aab5 100644
--- a/hw/xfree86/xaa/xaaPaintWin.c
+++ b/hw/xfree86/xaa/xaaPaintWin.c
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.1.4.1 2003/12/18 19:29:15 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.11 2003/02/17 16:08:29 dawes Exp $ */
#include "misc.h"
@@ -17,8 +17,8 @@
#include "xaawrap.h"
#ifdef XINERAMA
-#include "xinerama.h"
-#include "xineramaSrv.h"
+#include "panoramiX.h"
+#include "panoramiXsrv.h"
#endif
void
@@ -93,11 +93,11 @@ XAAPaintWindow(
yorg = pBgWin->drawable.y;
#ifdef XINERAMA
- if(!noXineramaExtension) {
+ if(!noPanoramiXExtension) {
int index = pScreen->myNum;
if(WindowTable[index] == pBgWin) {
- xorg -= xineramaDataPtr[index].x;
- yorg -= xineramaDataPtr[index].y;
+ xorg -= panoramiXdataPtr[index].x;
+ yorg -= panoramiXdataPtr[index].y;
}
}
#endif
diff --git a/hw/xfree86/xf8_32bpp/cfbpntwin.c b/hw/xfree86/xf8_32bpp/cfbpntwin.c
index 9730b0d0c..6ea5fa3fa 100644
--- a/hw/xfree86/xf8_32bpp/cfbpntwin.c
+++ b/hw/xfree86/xf8_32bpp/cfbpntwin.c
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1.4.1 2003/12/18 19:29:15 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.5 2001/10/01 13:44:15 eich Exp $ */
#include "X.h"
@@ -16,8 +16,8 @@
#include "mi.h"
#ifdef XINERAMA
-#include "xinerama.h"
-#include "xineramaSrv.h"
+#include "panoramiX.h"
+#include "panoramiXsrv.h"
#endif
void
@@ -45,11 +45,11 @@ cfb8_32PaintWindow(
xorg = pWin->drawable.x;
yorg = pWin->drawable.y;
#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
@@ -93,11 +93,11 @@ cfb8_32PaintWindow(
yorg = pBgWin->drawable.y;
#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
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 07:57:22 +0000