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, 127 insertions, 127 deletions

diff --git a/libX11/src/GetNrmHint.c b/libX11/src/GetNrmHint.c
index 289b9c429..6f328e8fd 100644
--- a/libX11/src/GetNrmHint.c
+++ b/libX11/src/GetNrmHint.c
@@ -1,127 +1,127 @@
-/***********************************************************

-Copyright 1988 by Wyse Technology, Inc., San Jose, Ca,

-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 Digital not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.

-

-DIGITAL AND WYSE DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

-EVENT SHALL DIGITAL OR WYSE 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.

-

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

-

-/*

-

-Copyright 1987, 1988, 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 <X11/Xlibint.h>

-#include <X11/Xatom.h>

-#include "Xatomtype.h"

-#include <X11/Xutil.h>

-#include <stdio.h>

-

-Status XGetWMSizeHints (

-    Display *dpy,

-    Window w,

-    XSizeHints *hints,

-    long *supplied,

-    Atom property)

-{

-    xPropSizeHints *prop = NULL;

-    Atom actual_type;

-    int actual_format;

-    unsigned long leftover;

-    unsigned long nitems;

-

-    if (XGetWindowProperty (dpy, w, property, 0L,

-			    (long)NumPropSizeElements,

-			    False, XA_WM_SIZE_HINTS, &actual_type,

-			    &actual_format, &nitems, &leftover,

-			    (unsigned char **)&prop)

-	!= Success)

-      return False;

-

-    if ((actual_type != XA_WM_SIZE_HINTS) ||

-	(nitems < OldNumPropSizeElements) || (actual_format != 32)) {

-	if (prop != NULL) Xfree ((char *)prop);

-	return False;

-    }

-

-    hints->flags	  = prop->flags;

-    /* XSizeHints misdeclares these as int instead of long */

-    hints->x = cvtINT32toInt (prop->x);

-    hints->y = cvtINT32toInt (prop->y);

-    hints->width = cvtINT32toInt (prop->width);

-    hints->height = cvtINT32toInt (prop->height);

-    hints->min_width  = cvtINT32toInt (prop->minWidth);

-    hints->min_height = cvtINT32toInt (prop->minHeight);

-    hints->max_width  = cvtINT32toInt (prop->maxWidth);

-    hints->max_height = cvtINT32toInt (prop->maxHeight);

-    hints->width_inc  = cvtINT32toInt (prop->widthInc);

-    hints->height_inc = cvtINT32toInt (prop->heightInc);

-    hints->min_aspect.x = cvtINT32toInt (prop->minAspectX);

-    hints->min_aspect.y = cvtINT32toInt (prop->minAspectY);

-    hints->max_aspect.x = cvtINT32toInt (prop->maxAspectX);

-    hints->max_aspect.y = cvtINT32toInt (prop->maxAspectY);

-

-    *supplied = (USPosition | USSize | PAllHints);

-    if (nitems >= NumPropSizeElements) {

-	hints->base_width= cvtINT32toInt (prop->baseWidth);

-	hints->base_height= cvtINT32toInt (prop->baseHeight);

-	hints->win_gravity= cvtINT32toInt (prop->winGravity);

-	*supplied |= (PBaseSize | PWinGravity);

-    }

-    hints->flags &= (*supplied);	/* get rid of unwanted bits */

-    Xfree((char *)prop);

-    return True;

-}

-

-

-Status XGetWMNormalHints (

-    Display *dpy,

-    Window w,

-    XSizeHints *hints,

-    long *supplied)

-{

-    return (XGetWMSizeHints (dpy, w, hints, supplied, XA_WM_NORMAL_HINTS));

-}

+/***********************************************************
+Copyright 1988 by Wyse Technology, Inc., San Jose, Ca,
+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 Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL AND WYSE DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL DIGITAL OR WYSE 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.
+
+******************************************************************/
+
+/*
+
+Copyright 1987, 1988, 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 <X11/Xlibint.h>
+#include <X11/Xatom.h>
+#include "Xatomtype.h"
+#include <X11/Xutil.h>
+#include <stdio.h>
+
+Status XGetWMSizeHints (
+    Display *dpy,
+    Window w,
+    XSizeHints *hints,
+    long *supplied,
+    Atom property)
+{
+    xPropSizeHints *prop = NULL;
+    Atom actual_type;
+    int actual_format;
+    unsigned long leftover;
+    unsigned long nitems;
+
+    if (XGetWindowProperty (dpy, w, property, 0L,
+			    (long)NumPropSizeElements,
+			    False, XA_WM_SIZE_HINTS, &actual_type,
+			    &actual_format, &nitems, &leftover,
+			    (unsigned char **)&prop)
+	!= Success)
+      return False;
+
+    if ((actual_type != XA_WM_SIZE_HINTS) ||
+	(nitems < OldNumPropSizeElements) || (actual_format != 32)) {
+	if (prop != NULL) Xfree ((char *)prop);
+	return False;
+    }
+
+    hints->flags	  = prop->flags;
+    /* XSizeHints misdeclares these as int instead of long */
+    hints->x = cvtINT32toInt (prop->x);
+    hints->y = cvtINT32toInt (prop->y);
+    hints->width = cvtINT32toInt (prop->width);
+    hints->height = cvtINT32toInt (prop->height);
+    hints->min_width  = cvtINT32toInt (prop->minWidth);
+    hints->min_height = cvtINT32toInt (prop->minHeight);
+    hints->max_width  = cvtINT32toInt (prop->maxWidth);
+    hints->max_height = cvtINT32toInt (prop->maxHeight);
+    hints->width_inc  = cvtINT32toInt (prop->widthInc);
+    hints->height_inc = cvtINT32toInt (prop->heightInc);
+    hints->min_aspect.x = cvtINT32toInt (prop->minAspectX);
+    hints->min_aspect.y = cvtINT32toInt (prop->minAspectY);
+    hints->max_aspect.x = cvtINT32toInt (prop->maxAspectX);
+    hints->max_aspect.y = cvtINT32toInt (prop->maxAspectY);
+
+    *supplied = (USPosition | USSize | PAllHints);
+    if (nitems >= NumPropSizeElements) {
+	hints->base_width= cvtINT32toInt (prop->baseWidth);
+	hints->base_height= cvtINT32toInt (prop->baseHeight);
+	hints->win_gravity= cvtINT32toInt (prop->winGravity);
+	*supplied |= (PBaseSize | PWinGravity);
+    }
+    hints->flags &= (*supplied);	/* get rid of unwanted bits */
+    Xfree((char *)prop);
+    return True;
+}
+
+
+Status XGetWMNormalHints (
+    Display *dpy,
+    Window w,
+    XSizeHints *hints,
+    long *supplied)
+{
+    return (XGetWMSizeHints (dpy, w, hints, supplied, XA_WM_NORMAL_HINTS));
+}