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

diff --git a/libX11/src/GetDflt.c b/libX11/src/GetDflt.c
index 584f32c54..0443e2d1a 100644
--- a/libX11/src/GetDflt.c
+++ b/libX11/src/GetDflt.c
@@ -1,265 +1,265 @@
-

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

-

-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.

-

-

-Copyright 1987, 1988 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_CONFIG_H

-#include <config.h>

-#endif

-#include "Xlibint.h"

-#include <X11/Xos.h>

-#include <X11/Xresource.h>

-

-#ifndef X_NOT_POSIX

-#ifdef _POSIX_SOURCE

-#include <limits.h>

-#else

-#define _POSIX_SOURCE

-#include <limits.h>

-#undef _POSIX_SOURCE

-#endif

-#endif

-#ifndef PATH_MAX

-#ifdef WIN32

-#define PATH_MAX 512

-#else

-#include <sys/param.h>

-#endif

-#ifndef PATH_MAX

-#ifdef MAXPATHLEN

-#define PATH_MAX MAXPATHLEN

-#else

-#define PATH_MAX 1024

-#endif

-#endif

-#endif

-

-#ifdef XTHREADS

-#include <X11/Xthreads.h>

-#endif

-#ifndef WIN32

-#define X_INCLUDE_PWD_H

-#define XOS_USE_XLIB_LOCKING

-#include <X11/Xos_r.h>

-#endif

-#include <stdio.h>

-#include <ctype.h>

-

-

-/*ARGSUSED*/

-static char *

-GetHomeDir(

-    char *dest,

-    int len)

-{

-#ifdef WIN32

-    register char *ptr1 = NULL;

-    register char *ptr2 = NULL;

-    int len1 = 0, len2 = 0;

-

-    if ((ptr1 = getenv("HOME"))) {	/* old, deprecated */

-	len1 = strlen (ptr1);

-    } else if ((ptr1 = getenv("HOMEDRIVE")) && (ptr2 = getenv("HOMEDIR"))) {

-	len1 = strlen (ptr1);

-	len2 = strlen (ptr2);

-    } else if ((ptr2 = getenv("USERNAME"))) {

-	len1 = strlen (ptr1 = "/users/");

-	len2 = strlen (ptr2);

-    }

-    if ((len1 + len2 + 1) < len)

-	sprintf (dest, "%s%s", ptr1, (ptr2) ? ptr2 : "");

-    else

-	*dest = '\0';

-#else

-#ifdef X_NEEDS_PWPARAMS

-    _Xgetpwparams pwparams;

-#endif

-    struct passwd *pw;

-    register char *ptr;

-

-    if (len <= 0 || dest == NULL)

-	return NULL;

-

-    if ((ptr = getenv("HOME"))) {

-	(void) strncpy(dest, ptr, len-1);

-	dest[len-1] = '\0';

-    } else {

-	if ((ptr = getenv("USER")))

-	    pw = _XGetpwnam(ptr,pwparams);

-	else

-	    pw = _XGetpwuid(getuid(),pwparams);

-	if (pw != NULL) {

-	    (void) strncpy(dest, pw->pw_dir, len-1);

-	    dest[len-1] = '\0';

-	} else

-	    *dest = '\0';

-    }

-#endif

-    return dest;

-}

-

-

-static XrmDatabase

-InitDefaults(

-    Display *dpy)			/* display for defaults.... */

-{

-    XrmDatabase userdb;

-    XrmDatabase xdb;

-    char fname[PATH_MAX];               /* longer than any conceivable size */

-    char *xenv;

-

-    XrmInitialize();

-

-    /*

-     * See lib/Xt/Initialize.c

-     *

-     * First, get the defaults from the server; if none, then load from

-     * ~/.Xdefaults.  Next, if there is an XENVIRONMENT environment variable,

-     * then load that file.

-     */

-     

-    if (dpy->xdefaults == NULL) {

-	#ifdef _MSC_VER

-	const char *slashDotXdefaults = ".Xdefaults";

-	#else

-	const char *slashDotXdefaults = "/.Xdefaults";

-	#endif

-

-	(void) GetHomeDir (fname, PATH_MAX - strlen (slashDotXdefaults) - 1);

-	(void) strcat (fname, slashDotXdefaults);

-	xdb = XrmGetFileDatabase (fname);

-    } else {

-	xdb = XrmGetStringDatabase(dpy->xdefaults);

-    }

-

-    if (!(xenv = getenv ("XENVIRONMENT"))) {

-	#ifdef _MSC_VER

-	const char *slashDotXdefaultsDash = ".Xdefaults-";

-	#else

-	const char *slashDotXdefaultsDash = "/.Xdefaults-";

-	#endif

-	int len;

-

-	(void) GetHomeDir (fname, PATH_MAX - strlen (slashDotXdefaultsDash) - 1);

-	(void) strcat (fname, slashDotXdefaultsDash);

-	len = strlen (fname);

-	(void) _XGetHostname (fname+len, PATH_MAX-len);

-	xenv = fname;

-    }

-    userdb = XrmGetFileDatabase (xenv);

-    XrmMergeDatabases (userdb, &xdb);

-    return (xdb);

-

-#ifdef old

-    if (fname[0] != '\0') userdb =  XrmGetFileDatabase(fname);

-    xdb = XrmGetStringDatabase(dpy->xdefaults);

-    XrmMergeDatabases(userdb, &xdb);

-    return xdb;

-#endif

-}

-

-char *

-XGetDefault(

-	Display *dpy,			/* display for defaults.... */

-	char _Xconst *prog,		/* name of program for option	*/

-	register _Xconst char *name)	/* name of option program wants */

-{					/* to get, for example, "font"  */

-	XrmName names[3];

-	XrmClass classes[3];

-	XrmRepresentation fromType;

-	XrmValue result;

-	char *progname;

-#ifdef WIN32

-	char *progname2;

-#endif

-#ifdef __UNIXOS2__

-	char *progname2;

-	char *dotpos;

-#endif

-

-	/*

-	 * strip path off of program name (XXX - this is OS specific)

-	 */

-	progname = strrchr (prog, '/');

-#ifdef WIN32

-	progname2 = strrchr (prog, '\\');

-	if (progname2 && (!progname || progname < progname2))

-	    progname = progname2;

-#endif

-#ifdef __UNIXOS2__  /* Very similar to WIN32 */

-	progname2 = strrchr (prog, '\\');

-	if (progname2 && (!progname || progname < progname2))

-	    progname = progname2;

-	dotpos = strrchr (prog, '.');

-	if (dotpos && (dotpos>progname2)) *dotpos='\0';

-#endif  /* We take out the .exe suffix  */

-

-	if (progname)

-	    progname++;

-	else

-	    progname = (char *)prog;

-

-	/*

-	 * see if database has ever been initialized.  Lookups can be done

-	 * without locks held.

-	 */

-	LockDisplay(dpy);

-	if (dpy->db == NULL) {

-	    dpy->db = InitDefaults(dpy);

-	    dpy->flags |= XlibDisplayDfltRMDB;

-	}

-	UnlockDisplay(dpy);

-

-	names[0] = XrmStringToName(progname);

-	names[1] = XrmStringToName(name);

-	names[2] = NULLQUARK;

-	classes[0] = XrmStringToClass("Program");

-	classes[1] = XrmStringToClass("Name");

-	classes[2] = NULLQUARK;

-	(void)XrmQGetResource(dpy->db, names, classes, &fromType, &result);

-	return (result.addr);

-}

-

+
+/***********************************************************
+
+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.
+
+
+Copyright 1987, 1988 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_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+#include <X11/Xos.h>
+#include <X11/Xresource.h>
+
+#ifndef X_NOT_POSIX
+#ifdef _POSIX_SOURCE
+#include <limits.h>
+#else
+#define _POSIX_SOURCE
+#include <limits.h>
+#undef _POSIX_SOURCE
+#endif
+#endif
+#ifndef PATH_MAX
+#ifdef WIN32
+#define PATH_MAX 512
+#else
+#include <sys/param.h>
+#endif
+#ifndef PATH_MAX
+#ifdef MAXPATHLEN
+#define PATH_MAX MAXPATHLEN
+#else
+#define PATH_MAX 1024
+#endif
+#endif
+#endif
+
+#ifdef XTHREADS
+#include <X11/Xthreads.h>
+#endif
+#ifndef WIN32
+#define X_INCLUDE_PWD_H
+#define XOS_USE_XLIB_LOCKING
+#include <X11/Xos_r.h>
+#endif
+#include <stdio.h>
+#include <ctype.h>
+
+
+/*ARGSUSED*/
+static char *
+GetHomeDir(
+    char *dest,
+    int len)
+{
+#ifdef WIN32
+    register char *ptr1 = NULL;
+    register char *ptr2 = NULL;
+    int len1 = 0, len2 = 0;
+
+    if ((ptr1 = getenv("HOME"))) {	/* old, deprecated */
+	len1 = strlen (ptr1);
+    } else if ((ptr1 = getenv("HOMEDRIVE")) && (ptr2 = getenv("HOMEDIR"))) {
+	len1 = strlen (ptr1);
+	len2 = strlen (ptr2);
+    } else if ((ptr2 = getenv("USERNAME"))) {
+	len1 = strlen (ptr1 = "/users/");
+	len2 = strlen (ptr2);
+    }
+    if ((len1 + len2 + 1) < len)
+	sprintf (dest, "%s%s", ptr1, (ptr2) ? ptr2 : "");
+    else
+	*dest = '\0';
+#else
+#ifdef X_NEEDS_PWPARAMS
+    _Xgetpwparams pwparams;
+#endif
+    struct passwd *pw;
+    register char *ptr;
+
+    if (len <= 0 || dest == NULL)
+	return NULL;
+
+    if ((ptr = getenv("HOME"))) {
+	(void) strncpy(dest, ptr, len-1);
+	dest[len-1] = '\0';
+    } else {
+	if ((ptr = getenv("USER")))
+	    pw = _XGetpwnam(ptr,pwparams);
+	else
+	    pw = _XGetpwuid(getuid(),pwparams);
+	if (pw != NULL) {
+	    (void) strncpy(dest, pw->pw_dir, len-1);
+	    dest[len-1] = '\0';
+	} else
+	    *dest = '\0';
+    }
+#endif
+    return dest;
+}
+
+
+static XrmDatabase
+InitDefaults(
+    Display *dpy)			/* display for defaults.... */
+{
+    XrmDatabase userdb;
+    XrmDatabase xdb;
+    char fname[PATH_MAX];               /* longer than any conceivable size */
+    char *xenv;
+
+    XrmInitialize();
+
+    /*
+     * See lib/Xt/Initialize.c
+     *
+     * First, get the defaults from the server; if none, then load from
+     * ~/.Xdefaults.  Next, if there is an XENVIRONMENT environment variable,
+     * then load that file.
+     */
+     
+    if (dpy->xdefaults == NULL) {
+	#ifdef _MSC_VER
+	const char *slashDotXdefaults = ".Xdefaults";
+	#else
+	const char *slashDotXdefaults = "/.Xdefaults";
+	#endif
+
+	(void) GetHomeDir (fname, PATH_MAX - strlen (slashDotXdefaults) - 1);
+	(void) strcat (fname, slashDotXdefaults);
+	xdb = XrmGetFileDatabase (fname);
+    } else {
+	xdb = XrmGetStringDatabase(dpy->xdefaults);
+    }
+
+    if (!(xenv = getenv ("XENVIRONMENT"))) {
+	#ifdef _MSC_VER
+	const char *slashDotXdefaultsDash = ".Xdefaults-";
+	#else
+	const char *slashDotXdefaultsDash = "/.Xdefaults-";
+	#endif
+	int len;
+
+	(void) GetHomeDir (fname, PATH_MAX - strlen (slashDotXdefaultsDash) - 1);
+	(void) strcat (fname, slashDotXdefaultsDash);
+	len = strlen (fname);
+	(void) _XGetHostname (fname+len, PATH_MAX-len);
+	xenv = fname;
+    }
+    userdb = XrmGetFileDatabase (xenv);
+    XrmMergeDatabases (userdb, &xdb);
+    return (xdb);
+
+#ifdef old
+    if (fname[0] != '\0') userdb =  XrmGetFileDatabase(fname);
+    xdb = XrmGetStringDatabase(dpy->xdefaults);
+    XrmMergeDatabases(userdb, &xdb);
+    return xdb;
+#endif
+}
+
+char *
+XGetDefault(
+	Display *dpy,			/* display for defaults.... */
+	char _Xconst *prog,		/* name of program for option	*/
+	register _Xconst char *name)	/* name of option program wants */
+{					/* to get, for example, "font"  */
+	XrmName names[3];
+	XrmClass classes[3];
+	XrmRepresentation fromType;
+	XrmValue result;
+	char *progname;
+#ifdef WIN32
+	char *progname2;
+#endif
+#ifdef __UNIXOS2__
+	char *progname2;
+	char *dotpos;
+#endif
+
+	/*
+	 * strip path off of program name (XXX - this is OS specific)
+	 */
+	progname = strrchr (prog, '/');
+#ifdef WIN32
+	progname2 = strrchr (prog, '\\');
+	if (progname2 && (!progname || progname < progname2))
+	    progname = progname2;
+#endif
+#ifdef __UNIXOS2__  /* Very similar to WIN32 */
+	progname2 = strrchr (prog, '\\');
+	if (progname2 && (!progname || progname < progname2))
+	    progname = progname2;
+	dotpos = strrchr (prog, '.');
+	if (dotpos && (dotpos>progname2)) *dotpos='\0';
+#endif  /* We take out the .exe suffix  */
+
+	if (progname)
+	    progname++;
+	else
+	    progname = (char *)prog;
+
+	/*
+	 * see if database has ever been initialized.  Lookups can be done
+	 * without locks held.
+	 */
+	LockDisplay(dpy);
+	if (dpy->db == NULL) {
+	    dpy->db = InitDefaults(dpy);
+	    dpy->flags |= XlibDisplayDfltRMDB;
+	}
+	UnlockDisplay(dpy);
+
+	names[0] = XrmStringToName(progname);
+	names[1] = XrmStringToName(name);
+	names[2] = NULLQUARK;
+	classes[0] = XrmStringToClass("Program");
+	classes[1] = XrmStringToClass("Name");
+	classes[2] = NULLQUARK;
+	(void)XrmQGetResource(dpy->db, names, classes, &fromType, &result);
+	return (result.addr);
+}
+