[Xorg-commit] xc/programs/Xserver/hw/xfree86/common xf86Config.c,1.1.4.2,1.1.4.3 xf86DGA.c,1.1.4.1,1.1.4.2 xf86Mode.c,1.1.4.1,1.1.4.2 xf86RandR.c,1.1.4.1,1.1.4.2
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Thu Dec 18 21:29:27 EET 2003
- Previous message: [Xorg-commit] xc/programs/Xserver/hw/xwin win.h,1.1.4.1.2.2,1.1.4.1.2.3 winwindowswm.c,1.1.2.1,1.1.2.2 winwin32rootless.c,1.1.2.1,1.1.2.2 winwin32rootlesswindow.c,1.1.2.1,1.1.2.2 winwin32rootlesswndproc.c,1.1.2.1,1.1.2.2
- Next message: [Xorg-commit] xc/programs/Xserver/hw/xfree86/drivers/apm apm_rush.c,1.1,1.1.4.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: kaleb
Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/common
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/hw/xfree86/common
Modified Files:
Tag: XORG-CURRENT
xf86Config.c xf86DGA.c xf86Mode.c xf86RandR.c
Log Message:
First pass at "Standard" Xinerama.
The sources for this came from Heather Lanigan's xinerama tree on
Sourceforge.Net.
No attempt has been made to handle previous, non-standard versions of
the protocol. Nor has any attempt been made to preserve the ABI of
previous versions -- that part will be added at a later time, and
then probably only on systems that have nice object/linker semantics,
e.g. ELF systems with weak symbols.
Index: xf86Config.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- xf86Config.c 26 Nov 2003 22:48:57 -0000 1.1.4.2
+++ xf86Config.c 18 Dec 2003 19:29:13 -0000 1.1.4.3
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.277 2003/10/15 22:51:48 dawes Exp $ */
@@ -1057,15 +1058,15 @@
}
#endif
-#ifdef PANORAMIX
+#ifdef XINERAMA
from = X_DEFAULT;
- if (!noPanoramiXExtension)
+ if (!noXineramaExtension)
from = X_CMDLINE;
else if (xf86GetOptValBool(FlagOptions, FLAG_XINERAMA, &value)) {
- noPanoramiXExtension = !value;
+ noXineramaExtension = !value;
from = X_CONFIG;
}
- if (!noPanoramiXExtension)
+ if (!noXineramaExtension)
xf86Msg(from, "Xinerama: enabled\n");
#endif
Index: xf86DGA.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- xf86DGA.c 26 Nov 2003 22:48:57 -0000 1.1.4.1
+++ xf86DGA.c 18 Dec 2003 19:29:13 -0000 1.1.4.2
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/* $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.
@@ -139,8 +140,8 @@
for(i = 0; i < num; i++)
modes[i].num = i + 1;
-#ifdef PANORAMIX
- if(!noPanoramiXExtension)
+#ifdef XINERAMA
+ if(!noXineramaExtension)
for(i = 0; i < num; i++)
modes[i].flags &= ~DGA_PIXMAP_AVAILABLE;
#endif
Index: xf86Mode.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- xf86Mode.c 26 Nov 2003 22:48:58 -0000 1.1.4.1
+++ xf86Mode.c 18 Dec 2003 19:29:13 -0000 1.1.4.2
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/* $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.
@@ -1681,8 +1682,8 @@
/* Lookup each mode */
#ifdef RANDR
if (!xf86Info.disableRandR
-#ifdef PANORAMIX
- && noPanoramiXExtension
+#ifdef XINERAMA
+ && noXineramaExtension
#endif
)
validateAllDefaultModes = TRUE;
Index: xf86RandR.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- xf86RandR.c 26 Nov 2003 22:48:58 -0000 1.1.4.1
+++ xf86RandR.c 18 Dec 2003 19:29:14 -0000 1.1.4.2
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/*
* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.8 2003/11/10 16:42:13 tsi Exp $
*
@@ -243,9 +244,9 @@
XF86RandRInfoPtr randrp;
ScrnInfoPtr scrp = XF86SCRNINFO(pScreen);
-#ifdef PANORAMIX
+#ifdef XINERAMA
/* XXX disable RandR when using Xinerama */
- if (!noPanoramiXExtension)
+ if (!noXineramaExtension)
return TRUE;
#endif
if (xf86RandRGeneration != serverGeneration)
- Previous message: [Xorg-commit] xc/programs/Xserver/hw/xwin win.h,1.1.4.1.2.2,1.1.4.1.2.3 winwindowswm.c,1.1.2.1,1.1.2.2 winwin32rootless.c,1.1.2.1,1.1.2.2 winwin32rootlesswindow.c,1.1.2.1,1.1.2.2 winwin32rootlesswndproc.c,1.1.2.1,1.1.2.2
- Next message: [Xorg-commit] xc/programs/Xserver/hw/xfree86/drivers/apm apm_rush.c,1.1,1.1.4.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xorg-commit
mailing list