kc3-lang/libxkbcommon

diff --git a/include/Makefile.am b/include/Makefile.am
index c5394cf..5ff1a97 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,2 +1,2 @@
-x11includedir = $(includedir)/X11
-x11include_HEADERS = X11/XkbCommon.h
+x11includedir = $(includedir)/extensions/X11
+x11include_HEADERS = X11/extensions/XKBcommon.h
diff --git a/include/X11/XkbCommon.h b/include/X11/XkbCommon.h
deleted file mode 100644
index afde5ad..0000000
--- a/include/X11/XkbCommon.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-Copyright 1985, 1987, 1990, 1998  The Open Group
-Copyright 2008  Dan Nicholson
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-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
-AUTHORS 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 names of the authors or their
-institutions 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 authors.
-*/
-
-#ifndef _XKBCOMMON_H_
-#define _XKBCOMMON_H_
-
-#include <X11/X.h>
-#include <X11/Xdefs.h>
-#include <X11/keysymdef.h>
-#include <X11/extensions/XKBstrcommon.h>
-#include <X11/extensions/XKBgeomcommon.h>
-
-/* Common keyboard description structure */
-typedef struct _XkbcDesc {
-    unsigned int        defined;
-    unsigned short      flags;
-    unsigned short      device_spec;
-    KeyCode             min_key_code;
-    KeyCode             max_key_code;
-
-    XkbControlsPtr      ctrls;
-    XkbServerMapPtr     server;
-    XkbClientMapPtr     map;
-    XkbIndicatorPtr     indicators;
-    XkbNamesPtr         names;
-    XkbCompatMapPtr     compat;
-    XkbGeometryPtr      geom;
-} XkbcDescRec, *XkbcDescPtr;
-
-extern char *
-XkbcKeysymToString(KeySym ks);
-
-extern KeySym
-XkbcStringToKeysym(const char *s);
-
-extern int
-XkbcAllocCompatMap(XkbcDescPtr xkb, unsigned which, unsigned nSI);
-
-extern void
-XkbcFreeCompatMap(XkbcDescPtr xkb, unsigned which, Bool freeMap);
-
-extern int
-XkbcAllocNames(XkbcDescPtr xkb, unsigned which, int nTotalRG, int nTotalAliases);
-
-extern void
-XkbcFreeNames(XkbcDescPtr xkb, unsigned which, Bool freeMap);
-
-extern int
-XkbcAllocControls(XkbcDescPtr xkb, unsigned which);
-
-extern void
-XkbcFreeControls(XkbcDescPtr xkb, unsigned which, Bool freeMap);
-
-extern int
-XkbcAllocIndicatorMaps(XkbcDescPtr xkb);
-
-extern void
-XkbcFreeIndicatorMaps(XkbcDescPtr xkb);
-
-extern XkbcDescRec *
-XkbcAllocKeyboard(void);
-
-extern int
-XkbcAllocClientMap(XkbcDescPtr xkb, unsigned which, unsigned nTotalTypes);
-
-extern int
-XkbcAllocServerMap(XkbcDescPtr xkb, unsigned which, unsigned nNewActions);
-
-extern void
-XkbcFreeClientMap(XkbcDescPtr xkb, unsigned what, Bool freeMap);
-
-extern void
-XkbcFreeServerMap(XkbcDescPtr xkb, unsigned what, Bool freeMap);
-
-extern void
-XkbcFreeKeyboard(XkbcDescPtr xkb, unsigned which, Bool freeAll);
-
-extern void
-XkbcFreeGeomProperties(XkbGeometryPtr geom, int first, int count, Bool freeAll);
-
-extern void
-XkbcFreeGeomKeyAliases(XkbGeometryPtr geom, int first, int count, Bool freeAll);
-
-extern void
-XkbcFreeGeomColors(XkbGeometryPtr geom, int first, int count, Bool freeAll);
-
-extern void
-XkbcFreeGeomPoints(XkbOutlinePtr outline, int first, int count, Bool freeAll);
-
-extern void
-XkbcFreeGeomOutlines(XkbShapePtr shape, int first, int count, Bool freeAll);
-
-extern void
-XkbcFreeGeomShapes(XkbGeometryPtr geom, int first, int count, Bool freeAll);
-
-extern void
-XkbcFreeGeomOverlayKeys(XkbOverlayRowPtr row, int first, int count,
-                        Bool freeAll);
-
-extern void
-XkbcFreeGeomOverlayRows(XkbOverlayPtr overlay, int first, int count,
-                        Bool freeAll);
-
-extern void
-XkbcFreeGeomOverlays(XkbSectionPtr section, int first, int count, Bool freeAll);
-
-extern void
-XkbcFreeGeomKeys(XkbRowPtr row, int first, int count, Bool freeAll);
-
-extern void
-XkbcFreeGeomRows(XkbSectionPtr section, int first, int count, Bool freeAll);
-
-extern void
-XkbcFreeGeomSections(XkbGeometryPtr geom, int first, int count, Bool freeAll);
-
-extern void
-XkbcFreeGeomDoodads(XkbDoodadPtr doodads, int nDoodads, Bool freeAll);
-
-extern void
-XkbcFreeGeometry(XkbGeometryPtr geom, unsigned which, Bool freeMap);
-
-extern int
-XkbcAllocGeometry(XkbcDescPtr xkb, XkbGeometrySizesPtr sizes);
-
-#endif /* _XKBCOMMON_H_ */
diff --git a/include/X11/extensions/XKBcommon.h b/include/X11/extensions/XKBcommon.h
new file mode 100644
index 0000000..afde5ad
--- /dev/null
+++ b/include/X11/extensions/XKBcommon.h
@@ -0,0 +1,149 @@
+/*
+Copyright 1985, 1987, 1990, 1998  The Open Group
+Copyright 2008  Dan Nicholson
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+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
+AUTHORS 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 names of the authors or their
+institutions 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 authors.
+*/
+
+#ifndef _XKBCOMMON_H_
+#define _XKBCOMMON_H_
+
+#include <X11/X.h>
+#include <X11/Xdefs.h>
+#include <X11/keysymdef.h>
+#include <X11/extensions/XKBstrcommon.h>
+#include <X11/extensions/XKBgeomcommon.h>
+
+/* Common keyboard description structure */
+typedef struct _XkbcDesc {
+    unsigned int        defined;
+    unsigned short      flags;
+    unsigned short      device_spec;
+    KeyCode             min_key_code;
+    KeyCode             max_key_code;
+
+    XkbControlsPtr      ctrls;
+    XkbServerMapPtr     server;
+    XkbClientMapPtr     map;
+    XkbIndicatorPtr     indicators;
+    XkbNamesPtr         names;
+    XkbCompatMapPtr     compat;
+    XkbGeometryPtr      geom;
+} XkbcDescRec, *XkbcDescPtr;
+
+extern char *
+XkbcKeysymToString(KeySym ks);
+
+extern KeySym
+XkbcStringToKeysym(const char *s);
+
+extern int
+XkbcAllocCompatMap(XkbcDescPtr xkb, unsigned which, unsigned nSI);
+
+extern void
+XkbcFreeCompatMap(XkbcDescPtr xkb, unsigned which, Bool freeMap);
+
+extern int
+XkbcAllocNames(XkbcDescPtr xkb, unsigned which, int nTotalRG, int nTotalAliases);
+
+extern void
+XkbcFreeNames(XkbcDescPtr xkb, unsigned which, Bool freeMap);
+
+extern int
+XkbcAllocControls(XkbcDescPtr xkb, unsigned which);
+
+extern void
+XkbcFreeControls(XkbcDescPtr xkb, unsigned which, Bool freeMap);
+
+extern int
+XkbcAllocIndicatorMaps(XkbcDescPtr xkb);
+
+extern void
+XkbcFreeIndicatorMaps(XkbcDescPtr xkb);
+
+extern XkbcDescRec *
+XkbcAllocKeyboard(void);
+
+extern int
+XkbcAllocClientMap(XkbcDescPtr xkb, unsigned which, unsigned nTotalTypes);
+
+extern int
+XkbcAllocServerMap(XkbcDescPtr xkb, unsigned which, unsigned nNewActions);
+
+extern void
+XkbcFreeClientMap(XkbcDescPtr xkb, unsigned what, Bool freeMap);
+
+extern void
+XkbcFreeServerMap(XkbcDescPtr xkb, unsigned what, Bool freeMap);
+
+extern void
+XkbcFreeKeyboard(XkbcDescPtr xkb, unsigned which, Bool freeAll);
+
+extern void
+XkbcFreeGeomProperties(XkbGeometryPtr geom, int first, int count, Bool freeAll);
+
+extern void
+XkbcFreeGeomKeyAliases(XkbGeometryPtr geom, int first, int count, Bool freeAll);
+
+extern void
+XkbcFreeGeomColors(XkbGeometryPtr geom, int first, int count, Bool freeAll);
+
+extern void
+XkbcFreeGeomPoints(XkbOutlinePtr outline, int first, int count, Bool freeAll);
+
+extern void
+XkbcFreeGeomOutlines(XkbShapePtr shape, int first, int count, Bool freeAll);
+
+extern void
+XkbcFreeGeomShapes(XkbGeometryPtr geom, int first, int count, Bool freeAll);
+
+extern void
+XkbcFreeGeomOverlayKeys(XkbOverlayRowPtr row, int first, int count,
+                        Bool freeAll);
+
+extern void
+XkbcFreeGeomOverlayRows(XkbOverlayPtr overlay, int first, int count,
+                        Bool freeAll);
+
+extern void
+XkbcFreeGeomOverlays(XkbSectionPtr section, int first, int count, Bool freeAll);
+
+extern void
+XkbcFreeGeomKeys(XkbRowPtr row, int first, int count, Bool freeAll);
+
+extern void
+XkbcFreeGeomRows(XkbSectionPtr section, int first, int count, Bool freeAll);
+
+extern void
+XkbcFreeGeomSections(XkbGeometryPtr geom, int first, int count, Bool freeAll);
+
+extern void
+XkbcFreeGeomDoodads(XkbDoodadPtr doodads, int nDoodads, Bool freeAll);
+
+extern void
+XkbcFreeGeometry(XkbGeometryPtr geom, unsigned which, Bool freeMap);
+
+extern int
+XkbcAllocGeometry(XkbcDescPtr xkb, XkbGeometrySizesPtr sizes);
+
+#endif /* _XKBCOMMON_H_ */
diff --git a/src/Makefile.am b/src/Makefile.am
index 3a0b2fa..2b5fa2b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@ $(builddir)/makekeys/makekeys$(EXEEXT):
 
 lib_LTLIBRARIES = libxkbcommon.la
 libxkbcommon_la_SOURCES = \
-	XkbCommonInt.h \
+	XKBcommonint.h \
 	ks_tables.h \
 	alloc.c \
 	galloc.c \
diff --git a/src/XKBcommonint.h b/src/XKBcommonint.h
new file mode 100644
index 0000000..1007ed7
--- /dev/null
+++ b/src/XKBcommonint.h
@@ -0,0 +1,58 @@
+/*
+Copyright 2008  Dan Nicholson
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+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
+AUTHORS 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 names of the authors or their
+institutions 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 authors.
+*/
+
+#ifndef _XKBCOMMONINT_H_
+#define _XKBCOMMONINT_H_
+
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef True
+#define True  1
+#define False 0
+#endif
+
+#ifdef MALLOC_0_RETURNS_NULL
+# define Xmalloc(size) malloc(((size) == 0 ? 1 : (size)))
+# define Xrealloc(ptr, size) realloc((ptr), ((size) == 0 ? 1 : (size)))
+# define Xcalloc(nelem, elsize) calloc(((nelem) == 0 ? 1 : (nelem)), (elsize))
+#else
+# define Xmalloc(size) malloc((size))
+# define Xrealloc(ptr, size) realloc((ptr), (size))
+# define Xcalloc(nelem, elsize) calloc((nelem), (elsize))
+#endif
+
+#define _XkbAlloc(s)            Xmalloc((s))
+#define _XkbCalloc(n,s)         Xcalloc((n),(s))
+#define _XkbRealloc(o,s)        Xrealloc((o),(s))
+#define _XkbTypedAlloc(t)       ((t *)Xmalloc(sizeof(t)))
+#define _XkbTypedCalloc(n,t)    ((t *)Xcalloc((n),sizeof(t)))
+#define _XkbTypedRealloc(o,n,t) \
+    ((o)?(t *)Xrealloc((o),(n)*sizeof(t)):_XkbTypedCalloc(n,t))
+#define _XkbClearElems(a,f,l,t) bzero(&(a)[f],((l)-(f)+1)*sizeof(t))
+#define _XkbFree(p)             free((p))
+
+#endif /* _XKBCOMMONINT_H_ */
diff --git a/src/XkbCommonInt.h b/src/XkbCommonInt.h
deleted file mode 100644
index 1007ed7..0000000
--- a/src/XkbCommonInt.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-Copyright 2008  Dan Nicholson
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-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
-AUTHORS 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 names of the authors or their
-institutions 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 authors.
-*/
-
-#ifndef _XKBCOMMONINT_H_
-#define _XKBCOMMONINT_H_
-
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef True
-#define True  1
-#define False 0
-#endif
-
-#ifdef MALLOC_0_RETURNS_NULL
-# define Xmalloc(size) malloc(((size) == 0 ? 1 : (size)))
-# define Xrealloc(ptr, size) realloc((ptr), ((size) == 0 ? 1 : (size)))
-# define Xcalloc(nelem, elsize) calloc(((nelem) == 0 ? 1 : (nelem)), (elsize))
-#else
-# define Xmalloc(size) malloc((size))
-# define Xrealloc(ptr, size) realloc((ptr), (size))
-# define Xcalloc(nelem, elsize) calloc((nelem), (elsize))
-#endif
-
-#define _XkbAlloc(s)            Xmalloc((s))
-#define _XkbCalloc(n,s)         Xcalloc((n),(s))
-#define _XkbRealloc(o,s)        Xrealloc((o),(s))
-#define _XkbTypedAlloc(t)       ((t *)Xmalloc(sizeof(t)))
-#define _XkbTypedCalloc(n,t)    ((t *)Xcalloc((n),sizeof(t)))
-#define _XkbTypedRealloc(o,n,t) \
-    ((o)?(t *)Xrealloc((o),(n)*sizeof(t)):_XkbTypedCalloc(n,t))
-#define _XkbClearElems(a,f,l,t) bzero(&(a)[f],((l)-(f)+1)*sizeof(t))
-#define _XkbFree(p)             free((p))
-
-#endif /* _XKBCOMMONINT_H_ */
diff --git a/src/alloc.c b/src/alloc.c
index dadf4e2..e2d2c17 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -26,8 +26,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "X11/XkbCommon.h"
-#include "XkbCommonInt.h"
+#include "X11/extensions/XKBcommon.h"
+#include "XKBcommonint.h"
 #include <X11/X.h>
 #include <X11/Xdefs.h>
 #include <X11/extensions/XKB.h>
diff --git a/src/galloc.c b/src/galloc.c
index c9b41ab..31e2b53 100644
--- a/src/galloc.c
+++ b/src/galloc.c
@@ -26,8 +26,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "X11/XkbCommon.h"
-#include "XkbCommonInt.h"
+#include "X11/extensions/XKBcommon.h"
+#include "XKBcommonint.h"
 #include <X11/X.h>
 #include <X11/Xdefs.h>
 #include <X11/extensions/XKB.h>
diff --git a/src/keysym.c b/src/keysym.c
index 9a419ba..a289a9a 100644
--- a/src/keysym.c
+++ b/src/keysym.c
@@ -30,7 +30,7 @@ authorization from the authors.
 #endif
 #include <X11/X.h>
 #include <X11/keysymdef.h>
-#include "X11/XkbCommon.h"
+#include "X11/extensions/XKBcommon.h"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/test/xkey.c b/test/xkey.c
index 4013201..015a432 100644
--- a/test/xkey.c
+++ b/test/xkey.c
@@ -1,4 +1,4 @@
-#include <X11/XkbCommon.h>
+#include "X11/extensions/XKBcommon.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>