Commit 3fc0dcc8167b2a306ba9a5146dade7b7b2387f63
2009-03-29T08:55:18
Generate keyboard description from components Finally, we can generate a XkbcDescPtr from a XkbComponentNamesPtr. This involves turning the components into a parsed XKB file and then passing it into the compiler. This first conversion needs more error handling.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137
diff --git a/include/X11/extensions/XKBcommon.h b/include/X11/extensions/XKBcommon.h
index 28ea338..f751be6 100644
--- a/include/X11/extensions/XKBcommon.h
+++ b/include/X11/extensions/XKBcommon.h
@@ -64,6 +64,9 @@ typedef struct _XkbcDesc {
_XFUNCPROTOBEGIN
+extern XkbcDescPtr
+XkbcCompileKeymap(XkbComponentNamesPtr ktcsg);
+
extern char *
XkbcKeysymToString(KeySym ks);
diff --git a/src/xkbcomp/Makefile.am b/src/xkbcomp/Makefile.am
index 534cc09..b934a88 100644
--- a/src/xkbcomp/Makefile.am
+++ b/src/xkbcomp/Makefile.am
@@ -32,6 +32,7 @@ libxkbcomp_la_SOURCES = \
utils.h \
vmod.c \
vmod.h \
+ xkbcomp.c \
xkbcomp.h \
xkbparse.y \
xkbpath.c \
diff --git a/src/xkbcomp/xkbcomp.c b/src/xkbcomp/xkbcomp.c
new file mode 100644
index 0000000..e8c2fb8
--- /dev/null
+++ b/src/xkbcomp/xkbcomp.c
@@ -0,0 +1,105 @@
+/*
+Copyright 2009 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.
+*/
+
+#include "X11/extensions/XKBcommon.h"
+#include <X11/extensions/XKM.h>
+#include "xkbcomp.h"
+#include "parseutils.h"
+#include "utils.h"
+
+static int
+XkbFileFromComponents(const XkbComponentNamesPtr ktcsg, XkbFile **file)
+{
+ XkbFile *keycodes, *types, *compat, *symbols, *geometry;
+ IncludeStmt *inc;
+
+ inc = IncludeCreate(ktcsg->keycodes, MergeDefault);
+ keycodes = CreateXKBFile(XkmKeyNamesIndex, NULL, (ParseCommon *)inc, 0);
+
+ inc = IncludeCreate(ktcsg->types, MergeDefault);
+ types = CreateXKBFile(XkmTypesIndex, NULL, (ParseCommon *)inc, 0);
+ AppendStmt(&keycodes->common, &types->common);
+
+ inc = IncludeCreate(ktcsg->compat, MergeDefault);
+ compat = CreateXKBFile(XkmCompatMapIndex, NULL, (ParseCommon *)inc, 0);
+ AppendStmt(&keycodes->common, &compat->common);
+
+ inc = IncludeCreate(ktcsg->symbols, MergeDefault);
+ symbols = CreateXKBFile(XkmSymbolsIndex, NULL, (ParseCommon *)inc, 0);
+ AppendStmt(&keycodes->common, &symbols->common);
+
+ inc = IncludeCreate(ktcsg->geometry, MergeDefault);
+ geometry = CreateXKBFile(XkmGeometryIndex, NULL, (ParseCommon *)inc, 0);
+ AppendStmt(&keycodes->common, &geometry->common);
+
+ *file = CreateXKBFile(XkmKeymapFile, ktcsg->keymap, &keycodes->common, 0);
+
+ return 1;
+}
+
+XkbcDescPtr
+XkbcCompileKeymap(XkbComponentNamesPtr ktcsg)
+{
+ XkbFile *file, *mapToUse;
+ XkbcDescPtr xkb;
+
+ if (!XkbFileFromComponents(ktcsg, &file)) {
+ ERROR("failed to generate parsed XKB file from components");
+ goto fail;
+ }
+
+ /* Find map to use */
+ mapToUse = file;
+ if (file->common.next) {
+ for (; mapToUse; mapToUse = (XkbFile *)mapToUse->common.next) {
+ if (mapToUse->flags & XkbLC_Default)
+ break;
+ }
+ if (!mapToUse) {
+ mapToUse = file;
+ WARN("no map specified, but components have several");
+ }
+ }
+
+ /* Compile the keyboard */
+ if (!(xkb = XkbcAllocKeyboard())) {
+ ERROR("Could not allocate keyboard description");
+ goto unwind_file;
+ }
+
+ if (!CompileKeymap(mapToUse, xkb, MergeReplace)) {
+ ERROR("Failed to compile keymap");
+ goto unwind_xkb;
+ }
+
+ return xkb;
+unwind_xkb:
+ XkbcFreeKeyboard(xkb, XkbAllComponentsMask, True);
+unwind_file:
+ /* XXX: here's where we would free the XkbFile */
+fail:
+ return NULL;
+}