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

diff --git a/xkbcomp/keymap.c b/xkbcomp/keymap.c
index a419d8c42..2c90f515d 100644
--- a/xkbcomp/keymap.c
+++ b/xkbcomp/keymap.c
@@ -1,183 +1,183 @@
-/************************************************************
- Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
-
- 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 Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
- of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
- of this software for any purpose. It is provided "as is"
- without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
- AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS 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.
-
- ********************************************************/
-
-#include "xkbcomp.h"
-#include "tokens.h"
-#include "expr.h"
-#include "vmod.h"
-#include "action.h"
-#include "misc.h"
-#include "indicators.h"
-
-#define	KEYCODES	0
-#define	GEOMETRY	1
-#define	TYPES		2
-#define	COMPAT		3
-#define	SYMBOLS		4
-#define	MAX_SECTIONS	5
-
-static XkbFile *sections[MAX_SECTIONS];
-
-/**
- * Compile the given file and store the output in result.
- * @param file A list of XkbFiles, each denoting one type (e.g.
- * XkmKeyNamesIdx, etc.)
- */
-Bool
-CompileKeymap(XkbFile * file, XkbFileInfo * result, unsigned merge)
-{
-    unsigned have;
-    Bool ok;
-    unsigned required, legal;
-    unsigned mainType;
-    char *mainName;
-    LEDInfo *unbound = NULL;
-
-    bzero(sections, MAX_SECTIONS * sizeof(XkbFile *));
-    mainType = file->type;
-    mainName = file->name;
-    switch (mainType)
-    {
-    case XkmSemanticsFile:
-        required = XkmSemanticsRequired;
-        legal = XkmSemanticsLegal;
-        break;
-    case XkmLayoutFile:        /* standard type  if setxkbmap -print */
-        required = XkmLayoutRequired;
-        legal = XkmKeymapLegal;
-        break;
-    case XkmKeymapFile:
-        required = XkmKeymapRequired;
-        legal = XkmKeymapLegal;
-        break;
-    default:
-        ERROR1("Cannot compile %s alone into an XKM file\n",
-               XkbConfigText(mainType, XkbMessage));
-        return False;
-    }
-    have = 0;
-    ok = 1;
-    file = (XkbFile *) file->defs;
-    /* Check for duplicate entries in the input file */
-    while ((file) && (ok))
-    {
-        file->topName = mainName;
-        if ((have & (1 << file->type)) != 0)
-        {
-            ERROR2("More than one %s section in a %s file\n",
-                   XkbConfigText(file->type, XkbMessage),
-                   XkbConfigText(mainType, XkbMessage));
-            ACTION("All sections after the first ignored\n");
-            ok = False;
-        }
-        else if ((1 << file->type) & (~legal))
-        {
-            ERROR2("Cannot define %s in a %s file\n",
-                   XkbConfigText(file->type, XkbMessage),
-                   XkbConfigText(mainType, XkbMessage));
-            ok = False;
-        }
-        else
-            switch (file->type)
-            {
-            case XkmSemanticsFile:
-            case XkmLayoutFile:
-            case XkmKeymapFile:
-                WSGO2("Illegal %s configuration in a %s file\n",
-                      XkbConfigText(file->type, XkbMessage),
-                      XkbConfigText(mainType, XkbMessage));
-                ACTION("Ignored\n");
-                ok = False;
-                break;
-            case XkmKeyNamesIndex:
-                sections[KEYCODES] = file;
-                break;
-            case XkmTypesIndex:
-                sections[TYPES] = file;
-                break;
-            case XkmSymbolsIndex:
-                sections[SYMBOLS] = file;
-                break;
-            case XkmCompatMapIndex:
-                sections[COMPAT] = file;
-                break;
-            case XkmGeometryIndex:
-            case XkmGeometryFile:
-                sections[GEOMETRY] = file;
-                break;
-            case XkmVirtualModsIndex:
-            case XkmIndicatorsIndex:
-                WSGO1("Found an isolated %s section\n",
-                      XkbConfigText(file->type, XkbMessage));
-                break;
-            default:
-                WSGO1("Unknown file type %d\n", file->type);
-                break;
-            }
-        if (ok)
-            have |= (1 << file->type);
-        file = (XkbFile *) file->common.next;
-    }
-    /* compile the sections we have in the file one-by-one, or fail. */
-    if (ok)
-    {
-        if (ok && (sections[KEYCODES] != NULL))
-            ok = CompileKeycodes(sections[KEYCODES], result, MergeOverride);
-        if (ok && (sections[GEOMETRY] != NULL))
-            ok = CompileGeometry(sections[GEOMETRY], result, MergeOverride);
-        if (ok && (sections[TYPES] != NULL))
-            ok = CompileKeyTypes(sections[TYPES], result, MergeOverride);
-        if (ok && (sections[COMPAT] != NULL))
-            ok = CompileCompatMap(sections[COMPAT], result, MergeOverride,
-                                  &unbound);
-        if (ok && (sections[SYMBOLS] != NULL))
-            ok = CompileSymbols(sections[SYMBOLS], result, MergeOverride);
-    }
-    if (!ok)
-        return False;
-    result->defined = have;
-    if (required & (~have))
-    {
-        register int i, bit;
-        unsigned missing;
-        missing = required & (~have);
-        for (i = 0, bit = 1; missing != 0; i++, bit <<= 1)
-        {
-            if (missing & bit)
-            {
-                ERROR2("Missing %s section in a %s file\n",
-                       XkbConfigText(i, XkbMessage),
-                       XkbConfigText(mainType, XkbMessage));
-                missing &= ~bit;
-            }
-        }
-        ACTION1("Description of %s not compiled\n",
-                XkbConfigText(mainType, XkbMessage));
-        ok = False;
-    }
-    ok = BindIndicators(result, True, unbound, NULL);
-    return ok;
-}
+/************************************************************

+ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.

+

+ 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 Silicon Graphics not be 

+ used in advertising or publicity pertaining to distribution 

+ of the software without specific prior written permission.

+ Silicon Graphics makes no representation about the suitability 

+ of this software for any purpose. It is provided "as is"

+ without any express or implied warranty.

+ 

+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 

+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 

+ AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON

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

+

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

+

+#include "xkbcomp.h"

+#include "tokens.h"

+#include "expr.h"

+#include "vmod.h"

+#include "action.h"

+#include "misc.h"

+#include "indicators.h"

+

+#define	KEYCODES	0

+#define	GEOMETRY	1

+#define	TYPES		2

+#define	COMPAT		3

+#define	SYMBOLS		4

+#define	MAX_SECTIONS	5

+

+static XkbFile *sections[MAX_SECTIONS];

+

+/**

+ * Compile the given file and store the output in result.

+ * @param file A list of XkbFiles, each denoting one type (e.g.

+ * XkmKeyNamesIdx, etc.)

+ */

+Bool

+CompileKeymap(XkbFile * file, XkbFileInfo * result, unsigned merge)

+{

+    unsigned have;

+    Bool ok;

+    unsigned required, legal;

+    unsigned mainType;

+    char *mainName;

+    LEDInfo *unbound = NULL;

+

+    bzero(sections, MAX_SECTIONS * sizeof(XkbFile *));

+    mainType = file->type;

+    mainName = file->name;

+    switch (mainType)

+    {

+    case XkmSemanticsFile:

+        required = XkmSemanticsRequired;

+        legal = XkmSemanticsLegal;

+        break;

+    case XkmLayoutFile:        /* standard type  if setxkbmap -print */

+        required = XkmLayoutRequired;

+        legal = XkmKeymapLegal;

+        break;

+    case XkmKeymapFile:

+        required = XkmKeymapRequired;

+        legal = XkmKeymapLegal;

+        break;

+    default:

+        ERROR1("Cannot compile %s alone into an XKM file\n",

+               XkbConfigText(mainType, XkbMessage));

+        return False;

+    }

+    have = 0;

+    ok = 1;

+    file = (XkbFile *) file->defs;

+    /* Check for duplicate entries in the input file */

+    while ((file) && (ok))

+    {

+        file->topName = mainName;

+        if ((have & (1 << file->type)) != 0)

+        {

+            ERROR2("More than one %s section in a %s file\n",

+                   XkbConfigText(file->type, XkbMessage),

+                   XkbConfigText(mainType, XkbMessage));

+            ACTION("All sections after the first ignored\n");

+            ok = False;

+        }

+        else if ((1 << file->type) & (~legal))

+        {

+            ERROR2("Cannot define %s in a %s file\n",

+                   XkbConfigText(file->type, XkbMessage),

+                   XkbConfigText(mainType, XkbMessage));

+            ok = False;

+        }

+        else

+            switch (file->type)

+            {

+            case XkmSemanticsFile:

+            case XkmLayoutFile:

+            case XkmKeymapFile:

+                WSGO2("Illegal %s configuration in a %s file\n",

+                      XkbConfigText(file->type, XkbMessage),

+                      XkbConfigText(mainType, XkbMessage));

+                ACTION("Ignored\n");

+                ok = False;

+                break;

+            case XkmKeyNamesIndex:

+                sections[KEYCODES] = file;

+                break;

+            case XkmTypesIndex:

+                sections[TYPES] = file;

+                break;

+            case XkmSymbolsIndex:

+                sections[SYMBOLS] = file;

+                break;

+            case XkmCompatMapIndex:

+                sections[COMPAT] = file;

+                break;

+            case XkmGeometryIndex:

+            case XkmGeometryFile:

+                sections[GEOMETRY] = file;

+                break;

+            case XkmVirtualModsIndex:

+            case XkmIndicatorsIndex:

+                WSGO1("Found an isolated %s section\n",

+                      XkbConfigText(file->type, XkbMessage));

+                break;

+            default:

+                WSGO1("Unknown file type %d\n", file->type);

+                break;

+            }

+        if (ok)

+            have |= (1 << file->type);

+        file = (XkbFile *) file->common.next;

+    }

+    /* compile the sections we have in the file one-by-one, or fail. */

+    if (ok)

+    {

+        if (ok && (sections[KEYCODES] != NULL))

+            ok = CompileKeycodes(sections[KEYCODES], result, MergeOverride);

+        if (ok && (sections[GEOMETRY] != NULL))

+            ok = CompileGeometry(sections[GEOMETRY], result, MergeOverride);

+        if (ok && (sections[TYPES] != NULL))

+            ok = CompileKeyTypes(sections[TYPES], result, MergeOverride);

+        if (ok && (sections[COMPAT] != NULL))

+            ok = CompileCompatMap(sections[COMPAT], result, MergeOverride,

+                                  &unbound);

+        if (ok && (sections[SYMBOLS] != NULL))

+            ok = CompileSymbols(sections[SYMBOLS], result, MergeOverride);

+    }

+    if (!ok)

+        return False;

+    result->defined = have;

+    if (required & (~have))

+    {

+        register int i, bit;

+        unsigned missing;

+        missing = required & (~have);

+        for (i = 0, bit = 1; missing != 0; i++, bit <<= 1)

+        {

+            if (missing & bit)

+            {

+                ERROR2("Missing %s section in a %s file\n",

+                       XkbConfigText(i, XkbMessage),

+                       XkbConfigText(mainType, XkbMessage));

+                missing &= ~bit;

+            }

+        }

+        ACTION1("Description of %s not compiled\n",

+                XkbConfigText(mainType, XkbMessage));

+        ok = False;

+    }

+    ok = BindIndicators(result, True, unbound, NULL);

+    return ok;

+}