Merge remote-tracking branch 'origin/released'

* origin/released:
  Changed file permissions
  dos -> unix

Conflicts:
	libX11/include/X11/Xregion.h
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/StrKeysym.c
	libX11/src/Window.c
	libX11/src/xkb/XKBBind.c
	libX11/src/xkb/XKBGetMap.c
	libX11/src/xkb/XKBSetGeom.c
	libX11/src/xkb/XKBUse.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libXdmcp/Key.c
	libXdmcp/Write.c
	libxcb/src/xcb_windefs.h
	xkbcomp/keycodes.c
	xkbcomp/xkbpath.c
	xorg-server/hw/xwin/glx/winpriv.h
	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/mln_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 144 insertions, 144 deletions

diff --git a/libX11/src/Window.c b/libX11/src/Window.c
index 1bceef819..341efee0f 100644
--- a/libX11/src/Window.c
+++ b/libX11/src/Window.c
@@ -1,144 +1,144 @@
-/*

-

-Copyright 1986, 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.

-

-*/

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include "Xlibint.h"

-

-#ifdef _MSC_VER

-#undef CreateWindow

-#endif

-

-void _XProcessWindowAttributes (

-    register Display *dpy,

-    xChangeWindowAttributesReq *req,

-    register unsigned long valuemask,

-    register XSetWindowAttributes *attributes)

-{

-    unsigned long values[32];

-    register unsigned long *value = values;

-    unsigned int nvalues;

-

-    if (valuemask & CWBackPixmap)

-	*value++ = attributes->background_pixmap;

-

-    if (valuemask & CWBackPixel)

-    	*value++ = attributes->background_pixel;

-

-    if (valuemask & CWBorderPixmap)

-    	*value++ = attributes->border_pixmap;

-

-    if (valuemask & CWBorderPixel)

-    	*value++ = attributes->border_pixel;

-

-    if (valuemask & CWBitGravity)

-    	*value++ = attributes->bit_gravity;

-

-    if (valuemask & CWWinGravity)

-	*value++ = attributes->win_gravity;

-

-    if (valuemask & CWBackingStore)

-        *value++ = attributes->backing_store;

-

-    if (valuemask & CWBackingPlanes)

-	*value++ = attributes->backing_planes;

-

-    if (valuemask & CWBackingPixel)

-    	*value++ = attributes->backing_pixel;

-

-    if (valuemask & CWOverrideRedirect)

-    	*value++ = attributes->override_redirect;

-

-    if (valuemask & CWSaveUnder)

-    	*value++ = attributes->save_under;

-

-    if (valuemask & CWEventMask)

-	*value++ = attributes->event_mask;

-

-    if (valuemask & CWDontPropagate)

-	*value++ = attributes->do_not_propagate_mask;

-

-    if (valuemask & CWColormap)

-	*value++ = attributes->colormap;

-

-    if (valuemask & CWCursor)

-	*value++ = attributes->cursor;

-

-    req->length += (nvalues = value - values);

-

-    nvalues <<= 2;			    /* watch out for macros... */

-    Data32 (dpy, (long *) values, (long)nvalues);

-

-}

-

-#define AllMaskBits (CWBackPixmap|CWBackPixel|CWBorderPixmap|\

-		     CWBorderPixel|CWBitGravity|CWWinGravity|\

-		     CWBackingStore|CWBackingPlanes|CWBackingPixel|\

-		     CWOverrideRedirect|CWSaveUnder|CWEventMask|\

-		     CWDontPropagate|CWColormap|CWCursor)

-

-Window XCreateWindow(

-    register Display *dpy,

-    Window parent,

-    int x,

-    int y,

-    unsigned int width,

-    unsigned int height,

-    unsigned int borderWidth,

-    int depth,

-    unsigned int class,

-    Visual *visual,

-    unsigned long valuemask,

-    XSetWindowAttributes *attributes)

-{

-    Window wid;

-    register xCreateWindowReq *req;

-

-    LockDisplay(dpy);

-    GetReq(CreateWindow, req);

-    req->parent = parent;

-    req->x = x;

-    req->y = y;

-    req->width = width;

-    req->height = height;

-    req->borderWidth = borderWidth;

-    req->depth = depth;

-    req->class = class;

-    if (visual == CopyFromParent)

-	req->visual = CopyFromParent;

-    else

-	req->visual = visual->visualid;

-    wid = req->wid = XAllocID(dpy);

-    valuemask &= AllMaskBits;

-    if ((req->mask = valuemask))

-        _XProcessWindowAttributes (dpy, (xChangeWindowAttributesReq *)req,

-			valuemask, attributes);

-    UnlockDisplay(dpy);

-    SyncHandle();

-    return (wid);

-    }

-

+/*
+
+Copyright 1986, 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.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+
+#ifdef _MSC_VER
+#undef CreateWindow
+#endif
+
+void _XProcessWindowAttributes (
+    register Display *dpy,
+    xChangeWindowAttributesReq *req,
+    register unsigned long valuemask,
+    register XSetWindowAttributes *attributes)
+{
+    unsigned long values[32];
+    register unsigned long *value = values;
+    unsigned int nvalues;
+
+    if (valuemask & CWBackPixmap)
+	*value++ = attributes->background_pixmap;
+
+    if (valuemask & CWBackPixel)
+    	*value++ = attributes->background_pixel;
+
+    if (valuemask & CWBorderPixmap)
+    	*value++ = attributes->border_pixmap;
+
+    if (valuemask & CWBorderPixel)
+    	*value++ = attributes->border_pixel;
+
+    if (valuemask & CWBitGravity)
+    	*value++ = attributes->bit_gravity;
+
+    if (valuemask & CWWinGravity)
+	*value++ = attributes->win_gravity;
+
+    if (valuemask & CWBackingStore)
+        *value++ = attributes->backing_store;
+
+    if (valuemask & CWBackingPlanes)
+	*value++ = attributes->backing_planes;
+
+    if (valuemask & CWBackingPixel)
+    	*value++ = attributes->backing_pixel;
+
+    if (valuemask & CWOverrideRedirect)
+    	*value++ = attributes->override_redirect;
+
+    if (valuemask & CWSaveUnder)
+    	*value++ = attributes->save_under;
+
+    if (valuemask & CWEventMask)
+	*value++ = attributes->event_mask;
+
+    if (valuemask & CWDontPropagate)
+	*value++ = attributes->do_not_propagate_mask;
+
+    if (valuemask & CWColormap)
+	*value++ = attributes->colormap;
+
+    if (valuemask & CWCursor)
+	*value++ = attributes->cursor;
+
+    req->length += (nvalues = value - values);
+
+    nvalues <<= 2;			    /* watch out for macros... */
+    Data32 (dpy, (long *) values, (long)nvalues);
+
+}
+
+#define AllMaskBits (CWBackPixmap|CWBackPixel|CWBorderPixmap|\
+		     CWBorderPixel|CWBitGravity|CWWinGravity|\
+		     CWBackingStore|CWBackingPlanes|CWBackingPixel|\
+		     CWOverrideRedirect|CWSaveUnder|CWEventMask|\
+		     CWDontPropagate|CWColormap|CWCursor)
+
+Window XCreateWindow(
+    register Display *dpy,
+    Window parent,
+    int x,
+    int y,
+    unsigned int width,
+    unsigned int height,
+    unsigned int borderWidth,
+    int depth,
+    unsigned int class,
+    Visual *visual,
+    unsigned long valuemask,
+    XSetWindowAttributes *attributes)
+{
+    Window wid;
+    register xCreateWindowReq *req;
+
+    LockDisplay(dpy);
+    GetReq(CreateWindow, req);
+    req->parent = parent;
+    req->x = x;
+    req->y = y;
+    req->width = width;
+    req->height = height;
+    req->borderWidth = borderWidth;
+    req->depth = depth;
+    req->class = class;
+    if (visual == CopyFromParent)
+	req->visual = CopyFromParent;
+    else
+	req->visual = visual->visualid;
+    wid = req->wid = XAllocID(dpy);
+    valuemask &= AllMaskBits;
+    if ((req->mask = valuemask))
+        _XProcessWindowAttributes (dpy, (xChangeWindowAttributesReq *)req,
+			valuemask, attributes);
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return (wid);
+    }
+