Merge branch 'master' into XACE-SELINUX

Conflicts:

	Xext/EVI.c
	Xext/bigreq.c
	Xext/cup.c
	Xext/dpms.c
	Xext/fontcache.c
	Xext/mitmisc.c
	Xext/xcmisc.c
	Xext/xf86bigfont.c
	Xext/xtest.c
	configure.ac
	dbe/dbe.c
	hw/darwin/darwin.h
	hw/darwin/darwinEvents.c
	hw/darwin/iokit/xfIOKit.h
	hw/darwin/iokit/xfIOKitCursor.c
	hw/darwin/quartz/fullscreen/fullscreen.c
	hw/darwin/quartz/fullscreen/quartzCursor.c
	hw/darwin/quartz/quartz.c
	hw/darwin/quartz/quartzCommon.h
	hw/darwin/quartz/quartzCursor.c
	hw/darwin/quartz/xpr/dri.c
	hw/darwin/quartz/xpr/dristruct.h
	hw/darwin/quartz/xpr/xprCursor.c
	hw/darwin/quartz/xpr/xprFrame.c
	hw/xfree86/modes/xf86RandR12.c
	include/cursor.h
	miext/rootless/rootlessCommon.h
	miext/rootless/rootlessScreen.c
	miext/rootless/rootlessWindow.c
	render/picturestr.h

Trying to pick up the pieces from the darwin churn here...

6 files changed, 7 insertions, 187 deletions

diff --git a/cfb/Makefile.am b/cfb/Makefile.am
index d24f027e7..901fc95ae 100644
--- a/cfb/Makefile.am
+++ b/cfb/Makefile.am
@@ -16,7 +16,6 @@ INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support  -I$(top_srcdir
 EXTRA_DIST = cfbline.c cfbfillarc.c cfbzerarc.c cfbblt.c cfbsolid.c \
              cfbtileodd.c cfbtile32.c cfb8line.c cfbply1rct.c cfbglblt8.c \
 	     cfb16.h cfb24.h cfb32.h cfb8bit.h cfbrrop.h \
-	     cfbtab.h \
 	     stip68kgnu.h stipmips.s stipsparc.s stipsprc32.s
 
 sdk_HEADERS = cfb.h cfb32.h cfb16.h cfbmap.h cfbunmap.h cfbmskbits.h
diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c
index c13baf143..00714cbc4 100644
--- a/cfb/cfbcppl.c
+++ b/cfb/cfbcppl.c
@@ -42,9 +42,7 @@ in this Software without prior written authorization from The Open Group.
 #include "maskbits.h"
 #define PSZ 8
 #include "mergerop.h"
-#else /* PSZ==8 */
-#include "cfbtab.h" /* provides starttab, endttab, partmasks */
-#endif /* PSZ==8 */
+#endif
 
 
 void
diff --git a/cfb/cfbmap.h b/cfb/cfbmap.h
index 2e709b19d..16e4afc3c 100644
--- a/cfb/cfbmap.h
+++ b/cfb/cfbmap.h
@@ -30,132 +30,6 @@ in this Software without prior written authorization from The Open Group.
  * Map names around so that multiple depths can be supported simultaneously
  */
 
-#if 0
-#undef QuartetBitsTable
-#undef QuartetPixelMaskTable
-#undef cfb8ClippedLineCopy
-#undef cfb8ClippedLineGeneral 
-#undef cfb8ClippedLineXor
-#undef cfb8LineSS1Rect
-#undef cfb8LineSS1RectCopy
-#undef cfb8LineSS1RectGeneral 
-#undef cfb8LineSS1RectPreviousCopy
-#undef cfb8LineSS1RectXor
-#undef cfb8SegmentSS1Rect
-#undef cfb8SegmentSS1RectCopy
-#undef cfb8SegmentSS1RectGeneral 
-#undef cfb8SegmentSS1RectShiftCopy
-#undef cfb8SegmentSS1RectXor
-#undef cfbAllocatePrivates
-#undef cfbBSFuncRec
-#undef cfbBitBlt
-#undef cfbBresD
-#undef cfbBresS
-#undef cfbChangeWindowAttributes
-#undef cfbCloseScreen
-#undef cfbCopyArea
-#undef cfbCopyImagePlane
-#undef cfbCopyPixmap
-#undef cfbCopyPlane
-#undef cfbCopyPlaneReduce
-#undef cfbCopyRotatePixmap
-#undef cfbCopyWindow
-#undef cfbCreateGC
-#undef cfbCreatePixmap
-#undef cfbCreateScreenResources
-#undef cfbCreateWindow
-#undef cfbDestroyPixmap
-#undef cfbDestroyWindow
-#undef cfbDoBitblt
-#undef cfbDoBitbltCopy
-#undef cfbDoBitbltGeneral
-#undef cfbDoBitbltOr
-#undef cfbDoBitbltXor
-#undef cfbFillBoxTile32sCopy
-#undef cfbFillBoxTile32sGeneral
-#undef cfbFillBoxTileOdd
-#undef cfbFillBoxTileOddCopy
-#undef cfbFillBoxTileOddGeneral
-#undef cfbFillPoly1RectCopy
-#undef cfbFillPoly1RectGeneral
-#undef cfbFillRectSolidCopy
-#undef cfbFillRectSolidGeneral
-#undef cfbFillRectSolidXor
-#undef cfbFillRectTile32Copy
-#undef cfbFillRectTile32General
-#undef cfbFillRectTileOdd
-#undef cfbFillSpanTile32sCopy
-#undef cfbFillSpanTile32sGeneral
-#undef cfbFillSpanTileOddCopy
-#undef cfbFillSpanTileOddGeneral
-#undef cfbFinishScreenInit
-#undef cfbGCFuncs
-#undef cfbGCPrivateIndex
-#undef cfbGetImage
-#undef cfbGetScreenPixmap
-#undef cfbGetSpans
-#undef cfbHorzS
-#undef cfbImageGlyphBlt8
-#undef cfbInitializeColormap
-#undef cfbInstallColormap
-#undef cfbLineSD
-#undef cfbLineSS
-#undef cfbListInstalledColormaps
-#undef cfbMapWindow
-#undef cfbMatchCommon
-#undef cfbNonTEOps
-#undef cfbNonTEOps1Rect
-#undef cfbPadPixmap
-#undef cfbPolyFillArcSolidCopy
-#undef cfbPolyFillArcSolidGeneral
-#undef cfbPolyFillRect
-#undef cfbPolyGlyphBlt8
-#undef cfbPolyGlyphRop8
-#undef cfbPolyPoint
-#undef cfbPositionWindow
-#undef cfbPutImage
-#undef cfbReduceRasterOp
-#undef cfbResolveColor
-#undef cfbRestoreAreas
-#undef cfbSaveAreas
-#undef cfbScreenInit
-#undef cfbScreenPrivateIndex
-#undef cfbSegmentSD
-#undef cfbSegmentSS
-#undef cfbSetScanline
-#undef cfbSetScreenPixmap
-#undef cfbSetSpans
-#undef cfbSetupScreen
-#undef cfbSolidSpansCopy
-#undef cfbSolidSpansGeneral
-#undef cfbSolidSpansXor
-#undef cfbStippleStack
-#undef cfbStippleStackTE
-#undef cfbTEGlyphBlt
-#undef cfbTEOps
-#undef cfbTEOps1Rect
-#undef cfbTile32FSCopy
-#undef cfbTile32FSGeneral
-#undef cfbUninstallColormap
-#undef cfbUnmapWindow
-#undef cfbUnnaturalStippleFS
-#undef cfbUnnaturalTileFS
-#undef cfbValidateGC
-#undef cfbVertS
-#undef cfbWindowPrivateIndex
-#undef cfbXRotatePixmap
-#undef cfbYRotatePixmap
-#undef cfbZeroPolyArcSS8Copy
-#undef cfbZeroPolyArcSS8General
-#undef cfbZeroPolyArcSS8Xor
-#undef cfbendpartial
-#undef cfbendtab
-#undef cfbmask
-#undef cfbrmask
-#undef cfbstartpartial
-#undef cfbstarttab
-#endif
-
 /* a losing vendor cpp dumps core if we define CFBNAME in terms of CATNAME */
 
 #if PSZ != 8
@@ -266,7 +140,7 @@ cfb can not hack PSZ yet
 #define cfbFillSpanTileOddGeneral CFBNAME(FillSpanTileOddGeneral)
 #define cfbFinishScreenInit CFBNAME(FinishScreenInit)
 #define cfbGCFuncs CFBNAME(GCFuncs)
-#define cfbGCPrivateIndex CFBNAME(GCPrivateIndex)
+#define cfbGCPrivateKey CFBNAME(GCPrivateKey)
 #define cfbGetImage CFBNAME(GetImage)
 #define cfbGetScreenPixmap CFBNAME(GetScreenPixmap)
 #define cfbGetSpans CFBNAME(GetSpans)
@@ -296,7 +170,7 @@ cfb can not hack PSZ yet
 #define cfbRestoreAreas CFBNAME(RestoreAreas)
 #define cfbSaveAreas CFBNAME(SaveAreas)
 #define cfbScreenInit CFBNAME(ScreenInit)
-#define cfbScreenPrivateIndex CFBNAME(ScreenPrivateIndex)
+#define cfbScreenPrivateKey CFBNAME(ScreenPrivateKey)
 #define cfbSegmentSD CFBNAME(SegmentSD)
 #define cfbSegmentSS CFBNAME(SegmentSS)
 #define cfbSetScanline CFBNAME(SetScanline)
@@ -320,7 +194,7 @@ cfb can not hack PSZ yet
 #define cfbUnnaturalTileFS CFBNAME(UnnaturalTileFS)
 #define cfbValidateGC CFBNAME(ValidateGC)
 #define cfbVertS CFBNAME(VertS)
-#define cfbWindowPrivateIndex CFBNAME(WindowPrivateIndex)
+#define cfbWindowPrivateKey CFBNAME(WindowPrivateKey)
 #define cfbXRotatePixmap CFBNAME(XRotatePixmap)
 #define cfbYRotatePixmap CFBNAME(YRotatePixmap)
 #define cfbZeroPolyArcSS8Copy CFBNAME(ZeroPolyArcSSCopy)
diff --git a/cfb/cfbmskbits.h b/cfb/cfbmskbits.h
index 6076269b3..5ee9125dd 100644
--- a/cfb/cfbmskbits.h
+++ b/cfb/cfbmskbits.h
@@ -831,42 +831,6 @@ if ((x) + (w) <= PPW) {\
     *(destpix) = (*(psrcpix)) & QuartetPixelMaskTable[q]; \
 }
 #if PSZ == 24
-# if 0
-#define getstipplepixels24(psrcstip,xt,w,ones,psrcpix,destpix,stipindex,srcindex,dstindex) \
-{ \
-    PixelGroup q; \
-    CfbBits src; \
-    register unsigned int sidx; \
-    register unsigned int didx; \
-    sidx = ((srcindex) & 3)<<1; \
-    didx = ((dstindex) & 3)<<1; \
-    q = *(psrcstip) >> (xt); \
-/*    if((srcindex)!=0)*/ \
-/*    src = (((*(psrcpix)) << cfb24Shift[sidx]) & (cfbmask[sidx])) |*/ \
-/*	(((*((psrcpix)+1)) << cfb24Shift[sidx+1]) & (cfbmask[sidx+1])); */\
-/*    else */\
-	src = (*(psrcpix))&0xFFFFFF; \
-    if ( ((xt)+(w)) > PGSZ ) \
-        q |= (*((psrcstip)+1)) << (PGSZ -(xt)); \
-    q = QuartetBitsTable[(w)] & ((ones) ? q : ~q); \
-    src &= QuartetPixelMaskTable[q]; \
-    *(destpix) &= cfbrmask[didx]; \
-    switch(didx) {\
-	case 0: \
-		*(destpix) |= (src &cfbmask[didx]); \
-		break; \
-	case 2: \
-	case 4: \
-		destpix++;didx++; \
-		*(destpix) = ((*(destpix)) & (cfbrmask[didx]))| \
-			(BitLeft(src, cfb24Shift[didx]) & (cfbmask[didx])); \
-		destpix--; didx--;\
-	case 6: \
-		*(destpix) |= (BitRight(src, cfb24Shift[didx]) & cfbmask[didx]); \
-		break; \
-	}; \
-}
-# else
 #define getstipplepixels24(psrcstip,xt,ones,psrcpix,destpix,stipindex) \
 { \
     PixelGroup q; \
@@ -874,7 +838,6 @@ if ((x) + (w) <= PPW) {\
     q = ((ones) ? q : ~q) & 1; \
     *(destpix) = (*(psrcpix)) & QuartetPixelMaskTable[q]; \
 }
-# endif
 #endif /* PSZ == 24 */
 #endif
 
diff --git a/cfb/cfbtab.h b/cfb/cfbtab.h
deleted file mode 100644
index 60d203f90..000000000
--- a/cfb/cfbtab.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef _CFBTAB_H_
-#define _CFBTAB_H_
-
-/* prototypes */
-#if 0
-extern int starttab[32], endtab[32];
-extern unsigned int partmasks[32][32];
-#endif
-
-#endif /* _CFBTAB_H_ */
diff --git a/cfb/cfbunmap.h b/cfb/cfbunmap.h
index d15c23e30..db9889217 100644
--- a/cfb/cfbunmap.h
+++ b/cfb/cfbunmap.h
@@ -93,7 +93,7 @@
 #undef cfbFillSpanTileOddGeneral
 #undef cfbFinishScreenInit
 #undef cfbGCFuncs
-#undef cfbGCPrivateIndex
+#undef cfbGCPrivateKey
 #undef cfbGetImage
 #undef cfbGetScreenPixmap
 #undef cfbGetSpans
@@ -123,7 +123,7 @@
 #undef cfbRestoreAreas
 #undef cfbSaveAreas
 #undef cfbScreenInit
-#undef cfbScreenPrivateIndex
+#undef cfbScreenPrivateKey
 #undef cfbSegmentSD
 #undef cfbSegmentSS
 #undef cfbSetScanline
@@ -147,7 +147,7 @@
 #undef cfbUnnaturalTileFS
 #undef cfbValidateGC
 #undef cfbVertS
-#undef cfbWindowPrivateIndex
+#undef cfbWindowPrivateKey
 #undef cfbXRotatePixmap
 #undef cfbYRotatePixmap
 #undef cfbZeroPolyArcSS8Copy