Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 237 insertions, 237 deletions

diff --git a/X11/extensions/shapeproto.h b/X11/extensions/shapeproto.h
index 49bd1a1a4..aba393b0f 100644
--- a/X11/extensions/shapeproto.h
+++ b/X11/extensions/shapeproto.h
@@ -1,237 +1,237 @@
-/************************************************************
-
-Copyright 1989, 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.
-
-********************************************************/
-
-#ifndef _SHAPEPROTO_H_
-#define _SHAPEPROTO_H_
-
-#include <X11/extensions/shapeconst.h>
-
-/*
- * Protocol requests constants and alignment values
- * These would really be in SHAPE's X.h and Xproto.h equivalents
- */
-
-#define Window CARD32
-#define Time CARD32
-
-#define X_ShapeQueryVersion		0
-#define X_ShapeRectangles		1
-#define X_ShapeMask			2
-#define X_ShapeCombine			3
-#define X_ShapeOffset			4
-#define X_ShapeQueryExtents		5
-#define X_ShapeSelectInput		6
-#define X_ShapeInputSelected		7
-#define X_ShapeGetRectangles		8
-
-typedef struct _ShapeQueryVersion {
-	CARD8	reqType;		/* always ShapeReqCode */
-	CARD8	shapeReqType;		/* always X_ShapeQueryVersion */
-	CARD16	length B16;
-} xShapeQueryVersionReq;
-#define sz_xShapeQueryVersionReq	4
-
-typedef struct {
-	BYTE	type;			/* X_Reply */
-	CARD8	unused;			/* not used */
-	CARD16	sequenceNumber B16;
-	CARD32	length B32;
-	CARD16	majorVersion B16;	/* major version of SHAPE protocol */
-	CARD16	minorVersion B16;	/* minor version of SHAPE protocol */
-	CARD32	pad0 B32;
-	CARD32	pad1 B32;
-	CARD32	pad2 B32;
-	CARD32	pad3 B32;
-	CARD32	pad4 B32;
-} xShapeQueryVersionReply;
-#define sz_xShapeQueryVersionReply	32
-
-typedef struct _ShapeRectangles {
-	CARD8	reqType;	/* always ShapeReqCode */
-	CARD8	shapeReqType;	/* always X_ShapeRectangles */
-	CARD16	length B16;
-	CARD8	op;		/* Set, ... */
-	CARD8	destKind;	/* ShapeBounding or ShapeClip */
-	CARD8	ordering;	/* UnSorted, YSorted, YXSorted, YXBanded */
-	CARD8	pad0;		/* not used */
-	Window	dest B32;
-	INT16	xOff B16;
-	INT16	yOff B16;
-} xShapeRectanglesReq;		/* followed by xRects */
-#define sz_xShapeRectanglesReq	16
-
-typedef struct _ShapeMask {
-	CARD8	reqType;	/* always ShapeReqCode */
-	CARD8	shapeReqType;	/* always X_ShapeMask */
-	CARD16	length B16;
-
-	CARD8	op;		/* Set, ... */
-	CARD8	destKind;	/* ShapeBounding or ShapeClip */
-	CARD16	junk B16;	/* not used */
-
-	Window	dest B32;
-	INT16	xOff B16;
-	INT16	yOff B16;
-	CARD32	src B32;	/* 1 bit pixmap */
-} xShapeMaskReq;
-#define sz_xShapeMaskReq	20
-
-typedef struct _ShapeCombine {
-	CARD8	reqType;	/* always ShapeReqCode */
-	CARD8	shapeReqType;	/* always X_ShapeCombine */
-	CARD16	length B16;
-	CARD8	op;		/* Set, ... */
-	CARD8	destKind;	/* ShapeBounding or ShapeClip */
-	CARD8	srcKind;	/* ShapeBounding or ShapeClip */
-	CARD8	junk;		/* not used */
-	Window	dest B32;
-	INT16	xOff B16;
-	INT16	yOff B16;
-	Window	src B32;
-} xShapeCombineReq;
-#define sz_xShapeCombineReq	20
-
-typedef struct _ShapeOffset {
-	CARD8	reqType;	/* always ShapeReqCode */
-	CARD8	shapeReqType;	/* always X_ShapeOffset */
-	CARD16	length B16;
-	CARD8	destKind;	/* ShapeBounding or ShapeClip */
-	CARD8	junk1;		/* not used */
-	CARD16	junk2 B16;	/* not used */
-	Window	dest B32;
-	INT16	xOff B16;
-	INT16	yOff B16;
-} xShapeOffsetReq;
-#define sz_xShapeOffsetReq	16
-
-typedef struct _ShapeQueryExtents {
-	CARD8	reqType;	/* always ShapeReqCode */
-	CARD8	shapeReqType;	/* always X_ShapeQueryExtents */
-	CARD16	length B16;
-	Window	window B32;
-} xShapeQueryExtentsReq;
-#define sz_xShapeQueryExtentsReq	8
-
-typedef struct {
-	BYTE	type;			/* X_Reply */
-	CARD8	unused;			/* not used */
-	CARD16	sequenceNumber B16;
-	CARD32	length B32;		/* 0 */
-	CARD8	boundingShaped;		/* window has bounding shape */
-	CARD8	clipShaped;		/* window has clip shape */
-	CARD16	unused1 B16;
-	INT16	xBoundingShape B16;	/* extents of bounding shape */
-	INT16	yBoundingShape B16;
-	CARD16	widthBoundingShape B16;
-	CARD16	heightBoundingShape B16;
-	INT16	xClipShape B16;		/* extents of clip shape */
-	INT16	yClipShape B16;
-	CARD16	widthClipShape B16;
-	CARD16	heightClipShape B16;
-	CARD32	pad1 B32;
-} xShapeQueryExtentsReply;
-#define sz_xShapeQueryExtentsReply	32
-
-typedef struct _ShapeSelectInput {
-	CARD8	reqType;	/* always ShapeReqCode */
-	CARD8	shapeReqType;	/* always X_ShapeSelectInput */
-	CARD16	length B16;
-	Window	window B32;
-	BYTE	enable;		/* xTrue -> send events */
-	BYTE	pad1;
-	CARD16	pad2 B16;
-} xShapeSelectInputReq;
-#define sz_xShapeSelectInputReq	12
-
-typedef struct _ShapeNotify {
-	BYTE	type;		/* always eventBase + ShapeNotify */
-	BYTE	kind;		/* either ShapeBounding or ShapeClip */
-	CARD16	sequenceNumber B16;
-	Window	window B32;
-	INT16	x B16;
-	INT16	y B16;		/* extents of new shape */
-	CARD16	width B16;
-	CARD16	height B16;
-	Time	time B32;	/* time of change */
-	BYTE	shaped;		/* set when a shape actual exists */
-	BYTE	pad0;
-	CARD16	pad1 B16;
-	CARD32	pad2 B32;
-	CARD32	pad3 B32;
-} xShapeNotifyEvent;
-#define sz_xShapeNotifyEvent	32
-
-typedef struct _ShapeInputSelected {
-	CARD8	reqType;	/* always ShapeReqCode */
-	CARD8	shapeReqType;	/* always X_ShapeInputSelected */
-	CARD16	length B16;
-	Window	window B32;
-} xShapeInputSelectedReq;
-#define sz_xShapeInputSelectedReq 8
-
-typedef struct {
-	BYTE	type;			/* X_Reply */
-	CARD8	enabled;		/* current status */
-	CARD16	sequenceNumber B16;
-	CARD32	length B32;		/* 0 */
-	CARD32	pad1 B32;		/* unused */
-	CARD32	pad2 B32;
-	CARD32	pad3 B32;
-	CARD32	pad4 B32;
-	CARD32	pad5 B32;
-	CARD32	pad6 B32;
-} xShapeInputSelectedReply;
-#define sz_xShapeInputSelectedReply	32
-
-typedef struct _ShapeGetRectangles {
-    CARD8   reqType;		/* always ShapeReqCode */
-    CARD8   shapeReqType;	/* always X_ShapeGetRectangles */
-    CARD16  length B16;
-    Window  window B32;
-    CARD8   kind;		/* ShapeBounding or ShapeClip */
-    CARD8   junk1;
-    CARD16  junk2 B16;
-} xShapeGetRectanglesReq;
-#define sz_xShapeGetRectanglesReq	12
-
-typedef struct {
-	BYTE	type;			/* X_Reply */
-	CARD8	ordering;	/* UnSorted, YSorted, YXSorted, YXBanded */
-	CARD16	sequenceNumber B16;
-	CARD32	length B32;		/* not zero */
-	CARD32	nrects B32;		/* number of rectangles */
-	CARD32 pad1 B32;
-	CARD32 pad2 B32;
-	CARD32 pad3 B32;
-	CARD32 pad4 B32;
-	CARD32 pad5 B32;
-} xShapeGetRectanglesReply;		/* followed by xRectangles */
-#define sz_xShapeGetRectanglesReply 32
-
-#undef Window
-#undef Time
-
-#endif /* _SHAPEPROTO_H_ */
+/************************************************************

+

+Copyright 1989, 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.

+

+********************************************************/

+

+#ifndef _SHAPEPROTO_H_

+#define _SHAPEPROTO_H_

+

+#include <X11/extensions/shapeconst.h>

+

+/*

+ * Protocol requests constants and alignment values

+ * These would really be in SHAPE's X.h and Xproto.h equivalents

+ */

+

+#define Window CARD32

+#define Time CARD32

+

+#define X_ShapeQueryVersion		0

+#define X_ShapeRectangles		1

+#define X_ShapeMask			2

+#define X_ShapeCombine			3

+#define X_ShapeOffset			4

+#define X_ShapeQueryExtents		5

+#define X_ShapeSelectInput		6

+#define X_ShapeInputSelected		7

+#define X_ShapeGetRectangles		8

+

+typedef struct _ShapeQueryVersion {

+	CARD8	reqType;		/* always ShapeReqCode */

+	CARD8	shapeReqType;		/* always X_ShapeQueryVersion */

+	CARD16	length B16;

+} xShapeQueryVersionReq;

+#define sz_xShapeQueryVersionReq	4

+

+typedef struct {

+	BYTE	type;			/* X_Reply */

+	CARD8	unused;			/* not used */

+	CARD16	sequenceNumber B16;

+	CARD32	length B32;

+	CARD16	majorVersion B16;	/* major version of SHAPE protocol */

+	CARD16	minorVersion B16;	/* minor version of SHAPE protocol */

+	CARD32	pad0 B32;

+	CARD32	pad1 B32;

+	CARD32	pad2 B32;

+	CARD32	pad3 B32;

+	CARD32	pad4 B32;

+} xShapeQueryVersionReply;

+#define sz_xShapeQueryVersionReply	32

+

+typedef struct _ShapeRectangles {

+	CARD8	reqType;	/* always ShapeReqCode */

+	CARD8	shapeReqType;	/* always X_ShapeRectangles */

+	CARD16	length B16;

+	CARD8	op;		/* Set, ... */

+	CARD8	destKind;	/* ShapeBounding or ShapeClip */

+	CARD8	ordering;	/* UnSorted, YSorted, YXSorted, YXBanded */

+	CARD8	pad0;		/* not used */

+	Window	dest B32;

+	INT16	xOff B16;

+	INT16	yOff B16;

+} xShapeRectanglesReq;		/* followed by xRects */

+#define sz_xShapeRectanglesReq	16

+

+typedef struct _ShapeMask {

+	CARD8	reqType;	/* always ShapeReqCode */

+	CARD8	shapeReqType;	/* always X_ShapeMask */

+	CARD16	length B16;

+

+	CARD8	op;		/* Set, ... */

+	CARD8	destKind;	/* ShapeBounding or ShapeClip */

+	CARD16	junk B16;	/* not used */

+

+	Window	dest B32;

+	INT16	xOff B16;

+	INT16	yOff B16;

+	CARD32	src B32;	/* 1 bit pixmap */

+} xShapeMaskReq;

+#define sz_xShapeMaskReq	20

+

+typedef struct _ShapeCombine {

+	CARD8	reqType;	/* always ShapeReqCode */

+	CARD8	shapeReqType;	/* always X_ShapeCombine */

+	CARD16	length B16;

+	CARD8	op;		/* Set, ... */

+	CARD8	destKind;	/* ShapeBounding or ShapeClip */

+	CARD8	srcKind;	/* ShapeBounding or ShapeClip */

+	CARD8	junk;		/* not used */

+	Window	dest B32;

+	INT16	xOff B16;

+	INT16	yOff B16;

+	Window	src B32;

+} xShapeCombineReq;

+#define sz_xShapeCombineReq	20

+

+typedef struct _ShapeOffset {

+	CARD8	reqType;	/* always ShapeReqCode */

+	CARD8	shapeReqType;	/* always X_ShapeOffset */

+	CARD16	length B16;

+	CARD8	destKind;	/* ShapeBounding or ShapeClip */

+	CARD8	junk1;		/* not used */

+	CARD16	junk2 B16;	/* not used */

+	Window	dest B32;

+	INT16	xOff B16;

+	INT16	yOff B16;

+} xShapeOffsetReq;

+#define sz_xShapeOffsetReq	16

+

+typedef struct _ShapeQueryExtents {

+	CARD8	reqType;	/* always ShapeReqCode */

+	CARD8	shapeReqType;	/* always X_ShapeQueryExtents */

+	CARD16	length B16;

+	Window	window B32;

+} xShapeQueryExtentsReq;

+#define sz_xShapeQueryExtentsReq	8

+

+typedef struct {

+	BYTE	type;			/* X_Reply */

+	CARD8	unused;			/* not used */

+	CARD16	sequenceNumber B16;

+	CARD32	length B32;		/* 0 */

+	CARD8	boundingShaped;		/* window has bounding shape */

+	CARD8	clipShaped;		/* window has clip shape */

+	CARD16	unused1 B16;

+	INT16	xBoundingShape B16;	/* extents of bounding shape */

+	INT16	yBoundingShape B16;

+	CARD16	widthBoundingShape B16;

+	CARD16	heightBoundingShape B16;

+	INT16	xClipShape B16;		/* extents of clip shape */

+	INT16	yClipShape B16;

+	CARD16	widthClipShape B16;

+	CARD16	heightClipShape B16;

+	CARD32	pad1 B32;

+} xShapeQueryExtentsReply;

+#define sz_xShapeQueryExtentsReply	32

+

+typedef struct _ShapeSelectInput {

+	CARD8	reqType;	/* always ShapeReqCode */

+	CARD8	shapeReqType;	/* always X_ShapeSelectInput */

+	CARD16	length B16;

+	Window	window B32;

+	BYTE	enable;		/* xTrue -> send events */

+	BYTE	pad1;

+	CARD16	pad2 B16;

+} xShapeSelectInputReq;

+#define sz_xShapeSelectInputReq	12

+

+typedef struct _ShapeNotify {

+	BYTE	type;		/* always eventBase + ShapeNotify */

+	BYTE	kind;		/* either ShapeBounding or ShapeClip */

+	CARD16	sequenceNumber B16;

+	Window	window B32;

+	INT16	x B16;

+	INT16	y B16;		/* extents of new shape */

+	CARD16	width B16;

+	CARD16	height B16;

+	Time	time B32;	/* time of change */

+	BYTE	shaped;		/* set when a shape actual exists */

+	BYTE	pad0;

+	CARD16	pad1 B16;

+	CARD32	pad2 B32;

+	CARD32	pad3 B32;

+} xShapeNotifyEvent;

+#define sz_xShapeNotifyEvent	32

+

+typedef struct _ShapeInputSelected {

+	CARD8	reqType;	/* always ShapeReqCode */

+	CARD8	shapeReqType;	/* always X_ShapeInputSelected */

+	CARD16	length B16;

+	Window	window B32;

+} xShapeInputSelectedReq;

+#define sz_xShapeInputSelectedReq 8

+

+typedef struct {

+	BYTE	type;			/* X_Reply */

+	CARD8	enabled;		/* current status */

+	CARD16	sequenceNumber B16;

+	CARD32	length B32;		/* 0 */

+	CARD32	pad1 B32;		/* unused */

+	CARD32	pad2 B32;

+	CARD32	pad3 B32;

+	CARD32	pad4 B32;

+	CARD32	pad5 B32;

+	CARD32	pad6 B32;

+} xShapeInputSelectedReply;

+#define sz_xShapeInputSelectedReply	32

+

+typedef struct _ShapeGetRectangles {

+    CARD8   reqType;		/* always ShapeReqCode */

+    CARD8   shapeReqType;	/* always X_ShapeGetRectangles */

+    CARD16  length B16;

+    Window  window B32;

+    CARD8   kind;		/* ShapeBounding or ShapeClip */

+    CARD8   junk1;

+    CARD16  junk2 B16;

+} xShapeGetRectanglesReq;

+#define sz_xShapeGetRectanglesReq	12

+

+typedef struct {

+	BYTE	type;			/* X_Reply */

+	CARD8	ordering;	/* UnSorted, YSorted, YXSorted, YXBanded */

+	CARD16	sequenceNumber B16;

+	CARD32	length B32;		/* not zero */

+	CARD32	nrects B32;		/* number of rectangles */

+	CARD32 pad1 B32;

+	CARD32 pad2 B32;

+	CARD32 pad3 B32;

+	CARD32 pad4 B32;

+	CARD32 pad5 B32;

+} xShapeGetRectanglesReply;		/* followed by xRectangles */

+#define sz_xShapeGetRectanglesReply 32

+

+#undef Window

+#undef Time

+

+#endif /* _SHAPEPROTO_H_ */