Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 93 insertions, 101 deletions

diff --git a/xorg-server/hw/xfree86/xaa/xaaNonTEGlyph.c b/xorg-server/hw/xfree86/xaa/xaaNonTEGlyph.c
index 7431ba2a0..bfe7f9a09 100644
--- a/xorg-server/hw/xfree86/xaa/xaaNonTEGlyph.c
+++ b/xorg-server/hw/xfree86/xaa/xaaNonTEGlyph.c
@@ -1,5 +1,4 @@
 
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -39,52 +38,52 @@
 
 void
 #ifdef TRIPLE_BITS
-EXPNAME(XAANonTEGlyphRenderer3)(
+ EXPNAME(XAANonTEGlyphRenderer3) (
 #else
-EXPNAME(XAANonTEGlyphRenderer)(
+ EXPNAME(XAANonTEGlyphRenderer) (
 #endif
-    ScrnInfoPtr pScrn,
-    int xText, int wText, 
-    int y, int h, int skipleft, int startline, 
-    NonTEGlyphInfo *glyphp,
-    int fg, int rop,
-    unsigned int planemask )
-{
+                                    ScrnInfoPtr pScrn,
+                                    int xText, int wText,
+                                    int y, int h, int skipleft, int startline,
+                                    NonTEGlyphInfo * glyphp,
+                                    int fg, int rop, unsigned int planemask) {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
-    CARD32* base = (CARD32*)infoRec->ColorExpandBase;
+    CARD32 *base = (CARD32 *) infoRec->ColorExpandBase;
+
 #ifdef TRIPLE_BITS
     int dwords = ((3 * wText + 31) >> 5) * h;
 #else
     int dwords = ((wText + 31) >> 5) * h;
 #endif
 
-    (*infoRec->SetupForCPUToScreenColorExpandFill)(
-					pScrn, fg, -1, rop, planemask);
-    (*infoRec->SubsequentCPUToScreenColorExpandFill)(
-					pScrn, xText, y, wText, h, 0);
+    (*infoRec->SetupForCPUToScreenColorExpandFill) (pScrn, fg, -1, rop,
+                                                    planemask);
+    (*infoRec->SubsequentCPUToScreenColorExpandFill) (pScrn, xText, y, wText, h,
+                                                      0);
 
 #ifndef FIXEDBASE
 #ifdef TRIPLE_BITS
-    if((((3 * wText + 31) >> 5) * h) <= infoRec->ColorExpandRange)
+    if ((((3 * wText + 31) >> 5) * h) <= infoRec->ColorExpandRange)
 #else
-    if((((wText + 31) >> 5) * h) <= infoRec->ColorExpandRange)
+    if ((((wText + 31) >> 5) * h) <= infoRec->ColorExpandRange)
 #endif
-	while(h--) 
-	    base = NonTEGlyphFunc(base, glyphp, startline++, wText, skipleft);
+        while (h--)
+            base = NonTEGlyphFunc(base, glyphp, startline++, wText, skipleft);
     else
 #endif
-	while(h--)
-	    NonTEGlyphFunc(base, glyphp, startline++, wText, skipleft);
+        while (h--)
+            NonTEGlyphFunc(base, glyphp, startline++, wText, skipleft);
 
-    if((infoRec->CPUToScreenColorExpandFillFlags & CPU_TRANSFER_PAD_QWORD) &&
-			(dwords & 1)) {
-	base = (CARD32*)infoRec->ColorExpandBase;
-	base[0] = 0x00000000;
+    if ((infoRec->CPUToScreenColorExpandFillFlags & CPU_TRANSFER_PAD_QWORD) &&
+        (dwords & 1)) {
+        base = (CARD32 *) infoRec->ColorExpandBase;
+        base[0] = 0x00000000;
     }
 
-    if(infoRec->CPUToScreenColorExpandFillFlags & SYNC_AFTER_COLOR_EXPAND) 
-	(*infoRec->Sync)(pScrn);
-    else SET_SYNC_FLAG(infoRec);
+    if (infoRec->CPUToScreenColorExpandFillFlags & SYNC_AFTER_COLOR_EXPAND)
+        (*infoRec->Sync) (pScrn);
+    else
+        SET_SYNC_FLAG(infoRec);
 }
 
 #ifndef FIXEDBASE
@@ -92,32 +91,31 @@ EXPNAME(XAANonTEGlyphRenderer)(
 
 void
 #ifdef TRIPLE_BITS
-EXPNAME(XAANonTEGlyphRendererScanline3)(
+ EXPNAME(XAANonTEGlyphRendererScanline3) (
 #else
-EXPNAME(XAANonTEGlyphRendererScanline)(
+ EXPNAME(XAANonTEGlyphRendererScanline) (
 #endif
-    ScrnInfoPtr pScrn,
-    int xText, int wText, 
-    int y, int h, int skipleft, int startline, 
-    NonTEGlyphInfo *glyphp,
-    int fg, int rop,
-    unsigned int planemask )
-{
+                                            ScrnInfoPtr pScrn,
+                                            int xText, int wText,
+                                            int y, int h, int skipleft,
+                                            int startline,
+                                            NonTEGlyphInfo * glyphp, int fg,
+                                            int rop, unsigned int planemask) {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
     int bufferNo = 0;
-    CARD32* base;
-
-    (*infoRec->SetupForScanlineCPUToScreenColorExpandFill)(
-				pScrn, fg, -1, rop, planemask);
-    (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill)(
-				pScrn, xText, y, wText, h, 0);
-
-    while(h--) {
-	base = (CARD32*)infoRec->ScanlineColorExpandBuffers[bufferNo];
-	NonTEGlyphFunc(base, glyphp, startline++, wText, skipleft);
-	(*infoRec->SubsequentColorExpandScanline)(pScrn, bufferNo++);
-	if(bufferNo >= infoRec->NumScanlineColorExpandBuffers)
-	    bufferNo = 0;
+    CARD32 *base;
+
+    (*infoRec->SetupForScanlineCPUToScreenColorExpandFill) (pScrn, fg, -1, rop,
+                                                            planemask);
+    (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill) (pScrn, xText, y,
+                                                              wText, h, 0);
+
+    while (h--) {
+        base = (CARD32 *) infoRec->ScanlineColorExpandBuffers[bufferNo];
+        NonTEGlyphFunc(base, glyphp, startline++, wText, skipleft);
+        (*infoRec->SubsequentColorExpandScanline) (pScrn, bufferNo++);
+        if (bufferNo >= infoRec->NumScanlineColorExpandBuffers)
+            bufferNo = 0;
     }
 
     SET_SYNC_FLAG(infoRec);
@@ -131,70 +129,64 @@ EXPNAME(XAANonTEGlyphRendererScanline)(
 
 ********************************************************************/
 
-
-CARD32* 
-NonTEGlyphFunc(
-    CARD32 *base,
-    NonTEGlyphInfo *glyphp,
-    int line, int TotalWidth, int skipleft )
+CARD32 *
+NonTEGlyphFunc(CARD32 *base,
+               NonTEGlyphInfo * glyphp, int line, int TotalWidth, int skipleft)
 {
     CARD32 bits = 0;
-    int shift = glyphp->width; 
+    int shift = glyphp->width;
 
-    if(skipleft) {
-	if((line >= glyphp->firstline) && (line <= glyphp->lastline))
+    if (skipleft) {
+        if ((line >= glyphp->firstline) && (line <= glyphp->lastline))
             bits = SHIFT_R(glyphp->bitsp[line], skipleft);
-	shift -= skipleft;
-    } else if((line >= glyphp->firstline) && (line <= glyphp->lastline))
-            bits =  glyphp->bitsp[line];
- 
-
-    while(TotalWidth > 32) {
-	while(shift < 32) {
-	    glyphp++;
-	    if((line >= glyphp->firstline) && (line <= glyphp->lastline)) 
-		bits |= SHIFT_L(glyphp->bitsp[line],shift);
-	    shift += glyphp->width;	
-	}
+        shift -= skipleft;
+    }
+    else if ((line >= glyphp->firstline) && (line <= glyphp->lastline))
+        bits = glyphp->bitsp[line];
+
+    while (TotalWidth > 32) {
+        while (shift < 32) {
+            glyphp++;
+            if ((line >= glyphp->firstline) && (line <= glyphp->lastline))
+                bits |= SHIFT_L(glyphp->bitsp[line], shift);
+            shift += glyphp->width;
+        }
 #ifdef TRIPLE_BITS
-	WRITE_BITS3(bits);
+        WRITE_BITS3(bits);
 #else
-	WRITE_BITS(bits);
+        WRITE_BITS(bits);
 #endif
-	shift &= 31;
-	if(shift && 
-	 (line >= glyphp->firstline) && (line <= glyphp->lastline)) 
-           bits = SHIFT_R(glyphp->bitsp[line], glyphp->width - shift);
-	else bits = 0;
-	TotalWidth -= 32;
+        shift &= 31;
+        if (shift && (line >= glyphp->firstline) && (line <= glyphp->lastline))
+            bits = SHIFT_R(glyphp->bitsp[line], glyphp->width - shift);
+        else
+            bits = 0;
+        TotalWidth -= 32;
     }
 
-    if(TotalWidth) {
-	TotalWidth -= shift;
-	while(TotalWidth > 0) {
-	     glyphp++;
-	     if((line >= glyphp->firstline) && (line <= glyphp->lastline)) 
-		bits |= SHIFT_L(glyphp->bitsp[line], shift);
-	     shift += glyphp->width;
-	     TotalWidth -= glyphp->width;
-	}
+    if (TotalWidth) {
+        TotalWidth -= shift;
+        while (TotalWidth > 0) {
+            glyphp++;
+            if ((line >= glyphp->firstline) && (line <= glyphp->lastline))
+                bits |= SHIFT_L(glyphp->bitsp[line], shift);
+            shift += glyphp->width;
+            TotalWidth -= glyphp->width;
+        }
 #ifdef TRIPLE_BITS
-	if (shift >= 22) {
-	    WRITE_BITS3(bits);
-	} else if (shift >= 11) {
-	    WRITE_BITS2(bits);
-	} else {
-	    WRITE_BITS1(bits);
-	}
+        if (shift >= 22) {
+            WRITE_BITS3(bits);
+        }
+        else if (shift >= 11) {
+            WRITE_BITS2(bits);
+        }
+        else {
+            WRITE_BITS1(bits);
+        }
 #else
-	WRITE_BITS(bits);
+        WRITE_BITS(bits);
 #endif
     }
 
-  
     return base;
 }
-
-
-
-