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, 181 insertions, 191 deletions

diff --git a/xorg-server/dix/glyphcurs.c b/xorg-server/dix/glyphcurs.c
index 946f447b2..9004cb152 100644
--- a/xorg-server/dix/glyphcurs.c
+++ b/xorg-server/dix/glyphcurs.c
@@ -1,191 +1,181 @@
-/************************************************************************

-

-Copyright 1987, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-

-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.

-

-                        All Rights Reserved

-

-Permission to use, copy, modify, and distribute this software and its 

-documentation for any purpose and without fee is hereby granted, 

-provided that the above copyright notice appear in all copies and that

-both that copyright notice and this permission notice appear in 

-supporting documentation, and that the name of Digital not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.  

-

-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

-SOFTWARE.

-

-************************************************************************/

-

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "misc.h"

-#include <X11/fonts/fontstruct.h>

-#include "dixfontstr.h"

-#include "scrnintstr.h"

-#include "gcstruct.h"

-#include "resource.h"

-#include "dix.h"

-#include "cursorstr.h"

-#include "opaque.h"

-#include "servermd.h"

-

-

-/*

-    get the bits out of the font in a portable way.  to avoid

-dealing with padding and such-like, we draw the glyph into

-a bitmap, then read the bits out with GetImage, which

-uses server-natural format.

-    since all screens return the same bitmap format, we'll just use

-the first one we find.

-    the character origin lines up with the hotspot in the

-cursor metrics.

-*/

-

-int

-ServerBitsFromGlyph(FontPtr pfont, unsigned ch, CursorMetricPtr cm, unsigned char **ppbits)

-{

-    ScreenPtr pScreen;

-    GCPtr pGC;

-    xRectangle rect;

-    PixmapPtr ppix;

-    long nby;

-    char *pbits;

-    ChangeGCVal gcval[3];

-    unsigned char char2b[2];

-

-    /* turn glyph index into a protocol-format char2b */

-    char2b[0] = (unsigned char)(ch >> 8);

-    char2b[1] = (unsigned char)(ch & 0xff);

-

-    pScreen = screenInfo.screens[0];

-    nby = BitmapBytePad(cm->width) * (long)cm->height;

-    pbits = calloc(1, nby);

-    if (!pbits)

-	return BadAlloc;

-

-    ppix = (PixmapPtr)(*pScreen->CreatePixmap)(pScreen, cm->width,

-					       cm->height, 1,

-					       CREATE_PIXMAP_USAGE_SCRATCH);

-    pGC = GetScratchGC(1, pScreen);

-    if (!ppix || !pGC)

-    {

-	if (ppix)

-	    (*pScreen->DestroyPixmap)(ppix);

-	if (pGC)

-	    FreeScratchGC(pGC);

-	free(pbits);

-	return BadAlloc;

-    }

-

-    rect.x = 0;

-    rect.y = 0;

-    rect.width = cm->width;

-    rect.height = cm->height;

-

-    /* fill the pixmap with 0 */

-    gcval[0].val = GXcopy;

-    gcval[1].val = 0;

-    gcval[2].ptr = (pointer)pfont;

-    ChangeGC(NullClient, pGC, GCFunction | GCForeground | GCFont, gcval);

-    ValidateGC((DrawablePtr)ppix, pGC);

-    (*pGC->ops->PolyFillRect)((DrawablePtr)ppix, pGC, 1, &rect);

-

-    /* draw the glyph */

-    gcval[0].val = 1;

-    ChangeGC(NullClient, pGC, GCForeground, gcval);

-    ValidateGC((DrawablePtr)ppix, pGC);

-    (*pGC->ops->PolyText16)((DrawablePtr)ppix, pGC, cm->xhot, cm->yhot,

-			    1, (unsigned short *)char2b);

-    (*pScreen->GetImage)((DrawablePtr)ppix, 0, 0, cm->width, cm->height,

-			 XYPixmap, 1, pbits);

-    *ppbits = (unsigned char *)pbits;

-    FreeScratchGC(pGC);

-    (*pScreen->DestroyPixmap)(ppix);

-    return Success;

-}

-

-

-Bool

-CursorMetricsFromGlyph(FontPtr pfont, unsigned ch, CursorMetricPtr cm)

-{

-    CharInfoPtr 	pci;

-    unsigned long	nglyphs;

-    CARD8		chs[2];

-    FontEncoding	encoding;

-

-    chs[0] = ch >> 8;

-    chs[1] = ch;

-    encoding = (FONTLASTROW(pfont) == 0) ? Linear16Bit : TwoD16Bit;

-    if (encoding == Linear16Bit)

-    {

-	if (ch < pfont->info.firstCol || pfont->info.lastCol < ch)

-	    return FALSE;

-    }

-    else

-    {

-	if (chs[0] < pfont->info.firstRow || pfont->info.lastRow < chs[0])

-	    return FALSE;

-	if (chs[1] < pfont->info.firstCol || pfont->info.lastCol < chs[1])

-	    return FALSE;

-    }

-    (*pfont->get_glyphs) (pfont, 1, chs, encoding, &nglyphs, &pci);

-    if (nglyphs == 0)

-	return FALSE;

-    cm->width = pci->metrics.rightSideBearing - pci->metrics.leftSideBearing;

-    cm->height = pci->metrics.descent + pci->metrics.ascent;

-    if (pci->metrics.leftSideBearing > 0)

-    {

-	cm->width += pci->metrics.leftSideBearing;

-	cm->xhot = 0;

-    }

-    else

-    {

-	cm->xhot = -pci->metrics.leftSideBearing;

-	if (pci->metrics.rightSideBearing < 0)

-	    cm->width -= pci->metrics.rightSideBearing;

-    }

-    if (pci->metrics.ascent < 0)

-    {

-	cm->height -= pci->metrics.ascent;

-	cm->yhot = 0;

-    }

-    else

-    {

-	cm->yhot = pci->metrics.ascent;

-	if (pci->metrics.descent < 0)

-	    cm->height -= pci->metrics.descent;

-    }

-    return TRUE;

-}

+/************************************************************************
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+************************************************************************/
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "misc.h"
+#include <X11/fonts/fontstruct.h>
+#include "dixfontstr.h"
+#include "scrnintstr.h"
+#include "gcstruct.h"
+#include "resource.h"
+#include "dix.h"
+#include "cursorstr.h"
+#include "opaque.h"
+#include "servermd.h"
+
+/*
+    get the bits out of the font in a portable way.  to avoid
+dealing with padding and such-like, we draw the glyph into
+a bitmap, then read the bits out with GetImage, which
+uses server-natural format.
+    since all screens return the same bitmap format, we'll just use
+the first one we find.
+    the character origin lines up with the hotspot in the
+cursor metrics.
+*/
+
+int
+ServerBitsFromGlyph(FontPtr pfont, unsigned ch, CursorMetricPtr cm,
+                    unsigned char **ppbits)
+{
+    ScreenPtr pScreen;
+    GCPtr pGC;
+    xRectangle rect;
+    PixmapPtr ppix;
+    long nby;
+    char *pbits;
+    ChangeGCVal gcval[3];
+    unsigned char char2b[2];
+
+    /* turn glyph index into a protocol-format char2b */
+    char2b[0] = (unsigned char) (ch >> 8);
+    char2b[1] = (unsigned char) (ch & 0xff);
+
+    pScreen = screenInfo.screens[0];
+    nby = BitmapBytePad(cm->width) * (long) cm->height;
+    pbits = calloc(1, nby);
+    if (!pbits)
+        return BadAlloc;
+
+    ppix = (PixmapPtr) (*pScreen->CreatePixmap) (pScreen, cm->width,
+                                                 cm->height, 1,
+                                                 CREATE_PIXMAP_USAGE_SCRATCH);
+    pGC = GetScratchGC(1, pScreen);
+    if (!ppix || !pGC) {
+        if (ppix)
+            (*pScreen->DestroyPixmap) (ppix);
+        if (pGC)
+            FreeScratchGC(pGC);
+        free(pbits);
+        return BadAlloc;
+    }
+
+    rect.x = 0;
+    rect.y = 0;
+    rect.width = cm->width;
+    rect.height = cm->height;
+
+    /* fill the pixmap with 0 */
+    gcval[0].val = GXcopy;
+    gcval[1].val = 0;
+    gcval[2].ptr = (pointer) pfont;
+    ChangeGC(NullClient, pGC, GCFunction | GCForeground | GCFont, gcval);
+    ValidateGC((DrawablePtr) ppix, pGC);
+    (*pGC->ops->PolyFillRect) ((DrawablePtr) ppix, pGC, 1, &rect);
+
+    /* draw the glyph */
+    gcval[0].val = 1;
+    ChangeGC(NullClient, pGC, GCForeground, gcval);
+    ValidateGC((DrawablePtr) ppix, pGC);
+    (*pGC->ops->PolyText16) ((DrawablePtr) ppix, pGC, cm->xhot, cm->yhot,
+                             1, (unsigned short *) char2b);
+    (*pScreen->GetImage) ((DrawablePtr) ppix, 0, 0, cm->width, cm->height,
+                          XYPixmap, 1, pbits);
+    *ppbits = (unsigned char *) pbits;
+    FreeScratchGC(pGC);
+    (*pScreen->DestroyPixmap) (ppix);
+    return Success;
+}
+
+Bool
+CursorMetricsFromGlyph(FontPtr pfont, unsigned ch, CursorMetricPtr cm)
+{
+    CharInfoPtr pci;
+    unsigned long nglyphs;
+    CARD8 chs[2];
+    FontEncoding encoding;
+
+    chs[0] = ch >> 8;
+    chs[1] = ch;
+    encoding = (FONTLASTROW(pfont) == 0) ? Linear16Bit : TwoD16Bit;
+    if (encoding == Linear16Bit) {
+        if (ch < pfont->info.firstCol || pfont->info.lastCol < ch)
+            return FALSE;
+    }
+    else {
+        if (chs[0] < pfont->info.firstRow || pfont->info.lastRow < chs[0])
+            return FALSE;
+        if (chs[1] < pfont->info.firstCol || pfont->info.lastCol < chs[1])
+            return FALSE;
+    }
+    (*pfont->get_glyphs) (pfont, 1, chs, encoding, &nglyphs, &pci);
+    if (nglyphs == 0)
+        return FALSE;
+    cm->width = pci->metrics.rightSideBearing - pci->metrics.leftSideBearing;
+    cm->height = pci->metrics.descent + pci->metrics.ascent;
+    if (pci->metrics.leftSideBearing > 0) {
+        cm->width += pci->metrics.leftSideBearing;
+        cm->xhot = 0;
+    }
+    else {
+        cm->xhot = -pci->metrics.leftSideBearing;
+        if (pci->metrics.rightSideBearing < 0)
+            cm->width -= pci->metrics.rightSideBearing;
+    }
+    if (pci->metrics.ascent < 0) {
+        cm->height -= pci->metrics.ascent;
+        cm->yhot = 0;
+    }
+    else {
+        cm->yhot = pci->metrics.ascent;
+        if (pci->metrics.descent < 0)
+            cm->height -= pci->metrics.descent;
+    }
+    return TRUE;
+}