[Xorg-commit] xc/programs/Xserver/hw/xfree86/common Imakefile,1.1.4.2,1.1.4.3 compiler.h,1.1.4.4,1.1.4.5 xf86.h,1.1.4.2,1.1.4.3 xf86Bus.c,1.1.4.2,1.1.4.3 xf86Helper.c,1.1.4.1,1.1.4.2 xf86Init.c,1.1.4.3,1.1.4.4 xf86Priv.h,1.1.4.2,1.1.4.3 xf86Privstr.h,1.1.4.1,1.1.4.2 xf86MiscExt.c,1.1.4.1,NONE
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Wed May 9 17:30:30 EEST 2007
- Previous message: [Xorg-commit] xc/programs/Xserver/hw/xfree86/doc BUILD,1.1.4.4,1.1.4.5 DESIGN,1.1.4.1,1.1.4.2 Imakefile,1.1.4.3,1.1.4.4 Install,1.1.4.3,1.1.4.4 LICENSE,1.1.4.2,1.1.4.3 README,1.1.4.4,1.1.4.5 README.DECtga,1.1.4.4,1.1.4.5 README.Darwin,1.1.4.3,1.1.4.4 README.LynxOS,1.1.4.4,1.1.4.5 README.NetBSD,1.1.4.4,1.1.4.5 README.OpenBSD,1.1.4.4,1.1.4.5 README.SiS,1.1.4.2,1.1.4.3 README.chips,1.1.4.4,1.1.4.5 README.fonts,1.1.4.2,1.1.4.3 README.mouse,1.1.4.4,1.1.4.5 README.s3virge,1.1.4.3,1.1.4.4 RELNOTES,1.1.4.4,1.1.4.5 Versions,1.1.4.1,1.1.4.2 Status,1.1.4.3,NONE
- Next message: [Xorg-commit] xc/programs/Xserver/hw/xfree86/drivers/ati Imakefile,1.1.4.1,1.1.4.2 ati.c,1.1.4.1,1.1.4.2 ati.h,1.1,1.1.4.1 atiaccel.c,1.1.4.1,1.1.4.2 atiaccel.h,1.1.4.1,1.1.4.2 atiadapter.c,1.1,1.1.4.1 atiadapter.h,1.1,1.1.4.1 atiadjust.c,1.1.4.1,1.1.4.2 atiadjust.h,1.1,1.1.4.1 atiaudio.c,1.1,1.1.4.1 atiaudio.h,1.1,1.1.4.1 atibank.c,1.1,1.1.4.1 atibank.h,1.1,1.1.4.1 atibus.c,1.1,1.1.4.1 atibus.h,1.1,1.1.4.1 atichip.c,1.1.4.1,1.1.4.2 atichip.h,1.1.4.1,1.1.4.2 aticlock.c,1.1.4.1,1.1.4.2 aticlock.h,1.1,1.1.4.1 aticonfig.c,1.1.4.1,1.1.4.2 aticonfig.h,1.1,1.1.4.1 aticonsole.c,1.1.4.1,1.1.4.2 aticonsole.h,1.1,1.1.4.1 aticrtc.h,1.1,1.1.4.1 aticursor.c,1.1.4.1,1.1.4.2 aticursor.h,1.1,1.1.4.1 atidac.c,1.1,1.1.4.1 atidac.h,1.1,1.1.4.1 atidecoder.c,1.1,1.1.4.1 atidecoder.h,1.1,1.1.4.1 atidga.c,1.1.4.1,1.1.4.2 atidga.h,1.1.4.1,1.1.4.2 atidsp.c,1.1.4.1,1.1.4.2 atidsp.h,1.1,1.1.4.1 atii2c.c,1.1,1.1.4.1 atii2c.h,1.1,1.1.4.1 atiident.c,1.1,1.1.4.1 atiident.h,1.1,1.1.4.1 atiio.h,1.1,1.1.4.1 atiload.c,1.1.4.1,1.1.4.2 atiload.h,1.1.4.1,1.1.4.2 atilock.c,1.1.4.1,1.1.4.2 atilock.h,1.1,1.1.4.1 atimach64.c,1.1.4.1,1.1.4.2 atimach64.h,1.1.4.1,1.1.4.2 atimach64accel.c,1.1,1.1.4.1 atimach64accel.h,1.1,1.1.4.1 atimach64cursor.c,1.1,1.1.4.1 atimach64cursor.h,1.1,1.1.4.1 atimach64i2c.c,1.1,1.1.4.1 atimach64i2c.h,1.1,1.1.4.1 atimach64io.c,1.1.4.1,1.1.4.2 atimach64io.h,1.1.4.1,1.1.4.2 atimach64xv.c,1.1,1.1.4.1 atimach64xv.h,1.1,1.1.4.1 atimisc.c,1.1.4.1,1.1.4.2 atimode.c,1.1.4.1,1.1.4.2 atimode.h,1.1,1.1.4.1 atimodule.c,1.1.4.1,1.1.4.2 atimodule.h,1.1,1.1.4.1 atimono.h,1.1,1.1.4.1 atioption.c,1.1.4.1,1.1.4.2 atioption.h,1.1.4.1,1.1.4.2 atipreinit.c,1.1.4.2,1.1.4.3 atipreinit.h,1.1,1.1.4.1 atiprint.c,1.1.4.1,1.1.4.2 atiprint.h,1.1,1.1.4.1 atipriv.h,1.1,1.1.4.1 atiprobe.c,1.1.4.1,1.1.4.2 atiprobe.h,1.1,1.1.4.1 atiproto.h,1.1.4.1,1.1.4.2 atiregs.h,1.1.4.1,1.1.4.2 atirgb514.c,1.1,1.1.4.1 atirgb514.h,1.1,1.1.4.1 atiscreen.c,1.1.4.1,1.1.4.2 atiscreen.h,1.1,1.1.4.1 atistruct.h,1.1.4.1,1.1.4.2 atituner.c,1.1,1.1.4.1 atituner.h,1.1,1.1.4.1 atiutil.c,1.1,1.1.4.1 atiutil.h,1.1,1.1.4.1 ativalid.c,1.1.4.1,1.1.4.2 ativalid.h,1.1.4.1,1.1.4.2 ativersion.h,1.1.4.2,1.1.4.3 ativga.c,1.1.4.1,1.1.4.2 ativga.h,1.1,1.1.4.1 ativgaio.c,1.1,1.1.4.1 ativgaio.h,1.1,1.1.4.1 atividmem.c,1.1.4.1,1.1.4.2 atividmem.h,1.1,1.1.4.1 atiwonder.c,1.1,1.1.4.1 atiwonder.h,1.1,1.1.4.1 atiwonderio.c,1.1,1.1.4.1 atiwonderio.h,1.1,1.1.4.1 atixv.c,1.1.4.1,1.1.4.2 atixv.h,1.1.4.1,1.1.4.2 r128_driver.c,1.1.4.1,1.1.4.2 r128_misc.c,1.1,1.1.4.1 r128_version.h,1.1,1.1.4.1 radeon.man,1.1.4.1,1.1.4.2 radeon_misc.c,1.1,1.1.4.1 radeon_version.h,1.1.4.1,1.1.4.2
- 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
Imakefile compiler.h xf86.h xf86Bus.c xf86Helper.c xf86Init.c
xf86Priv.h xf86Privstr.h
Removed Files:
Tag: XORG-CURRENT
xf86MiscExt.c
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214
Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/Imakefile,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Imakefile 26 Nov 2003 22:48:57 -0000 1.1.4.2
+++ b/Imakefile 23 Feb 2004 21:35:15 -0000 1.1.4.3
@@ -4,7 +4,7 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/common/Imakefile,v 3.154 2003/10/08 14:58:26 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/common/Imakefile,v 3.155 2004/01/27 01:29:02 dawes Exp $
@@ -275,3 +275,4 @@
InstallDriverSDKNonExecFile(xf86str.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(xf86xv.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(xf86xvmc.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(xisb.h,$(DRIVERSDKINCLUDEDIR))
Index: compiler.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/compiler.h,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/compiler.h 18 Feb 2004 21:43:19 -0000 1.1.4.4
+++ b/compiler.h 23 Feb 2004 21:35:15 -0000 1.1.4.5
@@ -1,5 +1,4 @@
-/* $XdotOrg$ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.105 2003/12/18 21:56:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.106 2004/02/02 03:55:28 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
*
@@ -59,6 +58,10 @@
# define _COMPILER_H
+#if defined(__SUNPRO_C)
+# define DO_PROTOTYPES
+#endif
+
/* Allow drivers to use the GCC-supported __inline__ and/or __inline. */
# ifndef __inline__
# if defined(__GNUC__)
@@ -1301,6 +1304,7 @@
# define mem_barrier() /* NOP */
# define write_mem_barrier() /* NOP */
+# if !defined(__SUNPRO_C)
# if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__)
# ifdef GCCUSESGAS
@@ -1446,6 +1450,7 @@
}
# endif /* FAKEIT */
+# endif /* __SUNPRO_C */
# endif /* ix86 */
@@ -1541,8 +1546,8 @@
#if 0
# include <sys/types.h>
#endif
-# if !defined(__HIGHC__) && !defined(__SUNPRO_C)
-# ifndef __USLC__
+# ifndef __HIGHC__
+# if !defined(__USLC__) && !defined(__SUNPRO_C)
# define __USLC__
# endif
# endif
@@ -1561,8 +1566,8 @@
# include <sys/types.h>
# endif /* IN_MODULE */
# endif /* USL */
-# ifndef sgi
-# include <sys/inline.h>
+# if !defined(sgi) && !defined(__SUNPRO_C)
+# include <sys/inline.h>
# endif
# else
# include "scoasm.h"
Index: xf86.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/xf86.h 26 Nov 2003 22:48:57 -0000 1.1.4.2
+++ b/xf86.h 23 Feb 2004 21:35:15 -0000 1.1.4.3
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86.h,v 3.172 2003/09/24 02:43:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86.h,v 3.173 2004/01/27 01:31:44 dawes Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -57,7 +57,6 @@
extern Bool xf86ResAccessEnter;
extern ScrnInfoPtr *xf86Screens; /* List of pointers to ScrnInfoRecs */
extern const unsigned char byte_reversed[256];
-extern PropertyPtr *xf86RegisteredPropertiesTable;
extern ScrnInfoPtr xf86CurrentScreen;
extern Bool pciSlotClaimed;
extern Bool isaSlotClaimed;
Index: xf86Bus.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Bus.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
--- a/xf86Bus.c 11 Feb 2004 19:29:37 -0000 1.1.4.2
+++ b/xf86Bus.c 23 Feb 2004 21:35:15 -0000 1.1.4.3
@@ -1,5 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c,v 1.79 2003/11/03 05:11:01 tsi Exp $ */
-/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c,v 1.80 2004/02/05 18:24:59 eich Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
*
Index: xf86Helper.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Helper.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
--- a/xf86Helper.c 26 Nov 2003 22:48:58 -0000 1.1.4.1
+++ b/xf86Helper.c 23 Feb 2004 21:35:15 -0000 1.1.4.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Helper.c,v 1.135 2003/10/08 14:58:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Helper.c,v 1.136 2004/01/27 01:31:45 dawes Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -2888,11 +2888,12 @@
xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
int format, unsigned long len, pointer value )
{
- PropertyPtr pNewProp, pRegProp;
+ RootWinPropPtr pNewProp = NULL, pRegProp;
int i;
+ Bool existing = FALSE;
#ifdef DEBUG
- ErrorF("xf86RegisterRootWindowProperty(%d, %d, %d, %d, %d, %p)\n",
+ ErrorF("xf86RegisterRootWindowProperty(%d, %ld, %ld, %d, %ld, %p)\n",
ScrnIndex, property, type, format, len, value);
#endif
@@ -2900,19 +2901,35 @@
return(BadMatch);
}
- if ( (pNewProp = (PropertyPtr)xalloc(sizeof(PropertyRec)))==NULL ) {
- return(BadAlloc);
+ if (xf86RegisteredPropertiesTable &&
+ xf86RegisteredPropertiesTable[ScrnIndex]) {
+ for (pNewProp = xf86RegisteredPropertiesTable[ScrnIndex];
+ pNewProp; pNewProp = pNewProp->next) {
+ if (strcmp(pNewProp->name, NameForAtom(property)) == 0)
+ break;
+ }
}
- pNewProp->propertyName = property;
+ if (!pNewProp) {
+ if ((pNewProp = (RootWinPropPtr)xalloc(sizeof(RootWinProp))) == NULL) {
+ return(BadAlloc);
+ }
+ /*
+ * We will put this property at the end of the list so that
+ * the changes are made in the order they were requested.
+ */
+ pNewProp->next = NULL;
+ } else {
+ if (pNewProp->name)
+ xfree(pNewProp->name);
+ existing = TRUE;
+ }
+
+ pNewProp->name = xnfstrdup(NameForAtom(property));
pNewProp->type = type;
pNewProp->format = format;
pNewProp->size = len;
pNewProp->data = value;
- /* We will put this property at the end of the list so that
- * the changes are made in the order they were requested.
- */
- pNewProp->next = NULL;
#ifdef DEBUG
ErrorF("new property filled\n");
@@ -2923,7 +2940,7 @@
ErrorF("creating xf86RegisteredPropertiesTable[] size %d\n",
xf86NumScreens);
#endif
- if ( NULL==(xf86RegisteredPropertiesTable=(PropertyPtr*)xnfcalloc(sizeof(PropertyPtr),xf86NumScreens) )) {
+ if ( NULL==(xf86RegisteredPropertiesTable=(RootWinPropPtr*)xnfcalloc(sizeof(RootWinProp),xf86NumScreens) )) {
return(BadAlloc);
}
for (i=0; i<xf86NumScreens; i++) {
@@ -2933,22 +2950,24 @@
#ifdef DEBUG
ErrorF("xf86RegisteredPropertiesTable %p\n",
- xf86RegisteredPropertiesTable);
+ (void *)xf86RegisteredPropertiesTable);
ErrorF("xf86RegisteredPropertiesTable[%d] %p\n",
- ScrnIndex, xf86RegisteredPropertiesTable[ScrnIndex]);
+ ScrnIndex, (void *)xf86RegisteredPropertiesTable[ScrnIndex]);
#endif
- if ( xf86RegisteredPropertiesTable[ScrnIndex] == NULL) {
- xf86RegisteredPropertiesTable[ScrnIndex] = pNewProp;
- } else {
- pRegProp = xf86RegisteredPropertiesTable[ScrnIndex];
- while (pRegProp->next != NULL) {
+ if (!existing) {
+ if ( xf86RegisteredPropertiesTable[ScrnIndex] == NULL) {
+ xf86RegisteredPropertiesTable[ScrnIndex] = pNewProp;
+ } else {
+ pRegProp = xf86RegisteredPropertiesTable[ScrnIndex];
+ while (pRegProp->next != NULL) {
#ifdef DEBUG
- ErrorF("- next %p\n", pRegProp);
+ ErrorF("- next %p\n", (void *)pRegProp);
#endif
- pRegProp = pRegProp->next;
+ pRegProp = pRegProp->next;
+ }
+ pRegProp->next = pNewProp;
}
- pRegProp->next = pNewProp;
}
#ifdef DEBUG
ErrorF("xf86RegisterRootWindowProperty succeeded\n");
Index: xf86Init.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/xf86Init.c 23 Feb 2004 16:32:14 -0000 1.1.4.3
+++ b/xf86Init.c 23 Feb 2004 21:35:15 -0000 1.1.4.4
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.211 2003/11/01 00:47:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.212 2004/01/27 01:31:45 dawes Exp $ */
/*
* Loosely based on code bearing the following copyright:
@@ -155,7 +155,7 @@
int ret = TRUE;
int err = Success;
ScreenPtr pScreen = pWin->drawable.pScreen;
- PropertyPtr pRegProp, pOldRegProp;
+ RootWinPropPtr pProp;
CreateWindowProcPtr CreateWindow =
(CreateWindowProcPtr)(pScreen->devPrivates[xf86CreateRootWindowIndex].ptr);
@@ -181,25 +181,19 @@
}
/* Now do our stuff */
-
if (xf86RegisteredPropertiesTable != NULL) {
if (pWin->parent == NULL && xf86RegisteredPropertiesTable != NULL) {
- for (pRegProp = xf86RegisteredPropertiesTable[pScreen->myNum];
- pRegProp != NULL && err==Success;
- pRegProp = pRegProp->next )
+ for (pProp = xf86RegisteredPropertiesTable[pScreen->myNum];
+ pProp != NULL && err==Success;
+ pProp = pProp->next )
{
- Atom oldNameAtom = pRegProp->propertyName;
- char *nameString;
- /* propertyName was created before the screen existed,
- * so the atom does not belong to any screen;
- * we need to create a new atom with the same name.
- */
- nameString = NameForAtom(oldNameAtom);
- pRegProp->propertyName = MakeAtom(nameString, strlen(nameString), TRUE);
+ Atom prop;
+
+ prop = MakeAtom(pProp->name, strlen(pProp->name), TRUE);
err = ChangeWindowProperty(pWin,
- pRegProp->propertyName, pRegProp->type,
- pRegProp->format, PropModeReplace,
- pRegProp->size, pRegProp->data,
+ prop, pProp->type,
+ pProp->format, PropModeReplace,
+ pProp->size, pProp->data,
FALSE
);
}
@@ -207,14 +201,6 @@
/* Look at err */
ret &= (err==Success);
- /* free memory */
- pOldRegProp = xf86RegisteredPropertiesTable[pScreen->myNum];
- while (pOldRegProp!=NULL) {
- pRegProp = pOldRegProp->next;
- xfree(pOldRegProp);
- pOldRegProp = pRegProp;
- }
- xf86RegisteredPropertiesTable[pScreen->myNum] = NULL;
} else {
xf86Msg(X_ERROR, "xf86CreateRootWindow unexpectedly called with "
"non-root window %p (parent %p)\n",
@@ -303,7 +289,6 @@
xf86ScreenIndex = AllocateScreenPrivateIndex();
xf86CreateRootWindowIndex = AllocateScreenPrivateIndex();
xf86PixmapIndex = AllocatePixmapPrivateIndex();
- xf86RegisteredPropertiesTable=NULL;
generation = serverGeneration;
}
@@ -749,6 +734,32 @@
}
formatsDone = TRUE;
+ if (xf86Info.vtno >= 0 ) {
+#define VT_ATOM_NAME "XFree86_VT"
+ Atom VTAtom=-1;
+ CARD32 *VT = NULL;
+ int ret;
+
+ /* This memory needs to stay available until the screen has been
+ initialized, and we can create the property for real.
+ */
+ if ( (VT = xalloc(sizeof(CARD32)))==NULL ) {
+ FatalError("Unable to make VT property - out of memory. Exiting...\n");
+ }
+ *VT = xf86Info.vtno;
+
+ VTAtom = MakeAtom(VT_ATOM_NAME, sizeof(VT_ATOM_NAME), TRUE);
+
+ for (i = 0, ret = Success; i < xf86NumScreens && ret == Success; i++) {
+ ret = xf86RegisterRootWindowProperty(xf86Screens[i]->scrnIndex,
+ VTAtom, XA_INTEGER, 32,
+ 1, VT );
+ if (ret != Success)
+ xf86DrvMsg(xf86Screens[i]->scrnIndex, X_WARNING,
+ "Failed to register VT property\n");
+ }
+ }
+
/* If a screen uses depth 24, show what the pixmap format is */
for (i = 0; i < xf86NumScreens; i++) {
if (xf86Screens[i]->depth == 24) {
Index: xf86Priv.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Priv.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/xf86Priv.h 26 Nov 2003 22:48:58 -0000 1.1.4.2
+++ b/xf86Priv.h 23 Feb 2004 21:35:15 -0000 1.1.4.3
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Priv.h,v 3.82 2003/09/09 03:20:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Priv.h,v 3.83 2004/01/27 01:31:45 dawes Exp $ */
/*
* Copyright (c) 1997-2002 by The XFree86 Project, Inc.
@@ -113,6 +113,8 @@
extern Bool xf86ProbeOnly;
extern Bool xf86DoProbe;
+extern RootWinPropPtr *xf86RegisteredPropertiesTable;
+
#ifndef DEFAULT_VERBOSE
#define DEFAULT_VERBOSE 0
#endif
Index: xf86Privstr.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/xf86Privstr.h 26 Nov 2003 22:48:58 -0000 1.1.4.1
+++ b/xf86Privstr.h 23 Feb 2004 21:35:15 -0000 1.1.4.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h,v 1.40 2003/10/17 20:02:12 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h,v 1.41 2004/01/27 01:31:45 dawes Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -198,6 +198,16 @@
} VidModeRec, *VidModePtr;
#endif
+/* Information for root window properties. */
+typedef struct _RootWinProp {
+ struct _RootWinProp * next;
+ char * name;
+ Atom type;
+ short format;
+ long size;
+ pointer data;
+} RootWinProp, *RootWinPropPtr;
+
/* private resource types */
#define ResNoAvoid ResBios
--- xf86MiscExt.c DELETED ---
- Previous message: [Xorg-commit] xc/programs/Xserver/hw/xfree86/doc BUILD,1.1.4.4,1.1.4.5 DESIGN,1.1.4.1,1.1.4.2 Imakefile,1.1.4.3,1.1.4.4 Install,1.1.4.3,1.1.4.4 LICENSE,1.1.4.2,1.1.4.3 README,1.1.4.4,1.1.4.5 README.DECtga,1.1.4.4,1.1.4.5 README.Darwin,1.1.4.3,1.1.4.4 README.LynxOS,1.1.4.4,1.1.4.5 README.NetBSD,1.1.4.4,1.1.4.5 README.OpenBSD,1.1.4.4,1.1.4.5 README.SiS,1.1.4.2,1.1.4.3 README.chips,1.1.4.4,1.1.4.5 README.fonts,1.1.4.2,1.1.4.3 README.mouse,1.1.4.4,1.1.4.5 README.s3virge,1.1.4.3,1.1.4.4 RELNOTES,1.1.4.4,1.1.4.5 Versions,1.1.4.1,1.1.4.2 Status,1.1.4.3,NONE
- Next message: [Xorg-commit] xc/programs/Xserver/hw/xfree86/drivers/ati Imakefile,1.1.4.1,1.1.4.2 ati.c,1.1.4.1,1.1.4.2 ati.h,1.1,1.1.4.1 atiaccel.c,1.1.4.1,1.1.4.2 atiaccel.h,1.1.4.1,1.1.4.2 atiadapter.c,1.1,1.1.4.1 atiadapter.h,1.1,1.1.4.1 atiadjust.c,1.1.4.1,1.1.4.2 atiadjust.h,1.1,1.1.4.1 atiaudio.c,1.1,1.1.4.1 atiaudio.h,1.1,1.1.4.1 atibank.c,1.1,1.1.4.1 atibank.h,1.1,1.1.4.1 atibus.c,1.1,1.1.4.1 atibus.h,1.1,1.1.4.1 atichip.c,1.1.4.1,1.1.4.2 atichip.h,1.1.4.1,1.1.4.2 aticlock.c,1.1.4.1,1.1.4.2 aticlock.h,1.1,1.1.4.1 aticonfig.c,1.1.4.1,1.1.4.2 aticonfig.h,1.1,1.1.4.1 aticonsole.c,1.1.4.1,1.1.4.2 aticonsole.h,1.1,1.1.4.1 aticrtc.h,1.1,1.1.4.1 aticursor.c,1.1.4.1,1.1.4.2 aticursor.h,1.1,1.1.4.1 atidac.c,1.1,1.1.4.1 atidac.h,1.1,1.1.4.1 atidecoder.c,1.1,1.1.4.1 atidecoder.h,1.1,1.1.4.1 atidga.c,1.1.4.1,1.1.4.2 atidga.h,1.1.4.1,1.1.4.2 atidsp.c,1.1.4.1,1.1.4.2 atidsp.h,1.1,1.1.4.1 atii2c.c,1.1,1.1.4.1 atii2c.h,1.1,1.1.4.1 atiident.c,1.1,1.1.4.1 atiident.h,1.1,1.1.4.1 atiio.h,1.1,1.1.4.1 atiload.c,1.1.4.1,1.1.4.2 atiload.h,1.1.4.1,1.1.4.2 atilock.c,1.1.4.1,1.1.4.2 atilock.h,1.1,1.1.4.1 atimach64.c,1.1.4.1,1.1.4.2 atimach64.h,1.1.4.1,1.1.4.2 atimach64accel.c,1.1,1.1.4.1 atimach64accel.h,1.1,1.1.4.1 atimach64cursor.c,1.1,1.1.4.1 atimach64cursor.h,1.1,1.1.4.1 atimach64i2c.c,1.1,1.1.4.1 atimach64i2c.h,1.1,1.1.4.1 atimach64io.c,1.1.4.1,1.1.4.2 atimach64io.h,1.1.4.1,1.1.4.2 atimach64xv.c,1.1,1.1.4.1 atimach64xv.h,1.1,1.1.4.1 atimisc.c,1.1.4.1,1.1.4.2 atimode.c,1.1.4.1,1.1.4.2 atimode.h,1.1,1.1.4.1 atimodule.c,1.1.4.1,1.1.4.2 atimodule.h,1.1,1.1.4.1 atimono.h,1.1,1.1.4.1 atioption.c,1.1.4.1,1.1.4.2 atioption.h,1.1.4.1,1.1.4.2 atipreinit.c,1.1.4.2,1.1.4.3 atipreinit.h,1.1,1.1.4.1 atiprint.c,1.1.4.1,1.1.4.2 atiprint.h,1.1,1.1.4.1 atipriv.h,1.1,1.1.4.1 atiprobe.c,1.1.4.1,1.1.4.2 atiprobe.h,1.1,1.1.4.1 atiproto.h,1.1.4.1,1.1.4.2 atiregs.h,1.1.4.1,1.1.4.2 atirgb514.c,1.1,1.1.4.1 atirgb514.h,1.1,1.1.4.1 atiscreen.c,1.1.4.1,1.1.4.2 atiscreen.h,1.1,1.1.4.1 atistruct.h,1.1.4.1,1.1.4.2 atituner.c,1.1,1.1.4.1 atituner.h,1.1,1.1.4.1 atiutil.c,1.1,1.1.4.1 atiutil.h,1.1,1.1.4.1 ativalid.c,1.1.4.1,1.1.4.2 ativalid.h,1.1.4.1,1.1.4.2 ativersion.h,1.1.4.2,1.1.4.3 ativga.c,1.1.4.1,1.1.4.2 ativga.h,1.1,1.1.4.1 ativgaio.c,1.1,1.1.4.1 ativgaio.h,1.1,1.1.4.1 atividmem.c,1.1.4.1,1.1.4.2 atividmem.h,1.1,1.1.4.1 atiwonder.c,1.1,1.1.4.1 atiwonder.h,1.1,1.1.4.1 atiwonderio.c,1.1,1.1.4.1 atiwonderio.h,1.1,1.1.4.1 atixv.c,1.1.4.1,1.1.4.2 atixv.h,1.1.4.1,1.1.4.2 r128_driver.c,1.1.4.1,1.1.4.2 r128_misc.c,1.1,1.1.4.1 r128_version.h,1.1,1.1.4.1 radeon.man,1.1.4.1,1.1.4.2 radeon_misc.c,1.1,1.1.4.1 radeon_version.h,1.1.4.1,1.1.4.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xorg-commit
mailing list