Move *Text APIs into libxkbcommon

These seem like they might be generally useful, and more will be needed
from xkbfile.

diff --git a/include/X11/extensions/XKBcommon.h b/include/X11/extensions/XKBcommon.h
index 7f98287..16e0a7b 100644 (file)
--- a/include/X11/extensions/XKBcommon.h
+++ b/include/X11/extensions/XKBcommon.h
@@ -158,6 +158,12 @@ XkbcAtomGetString(Atom atom);
 extern Atom
 XkbcInternAtom(char *name, Bool onlyIfExists);
 
+extern char *
+XkbConfigText(unsigned config);
+
+extern char *
+XkbActionTypeText(unsigned type);
+
 _XFUNCPROTOEND
 
 #endif /* _XKBCOMMON_H_ */

diff --git a/src/Makefile.am b/src/Makefile.am
index a440050..3fcf6bb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,4 +10,5 @@ libxkbcommon_la_SOURCES = \
        alloc.c \
        galloc.c \
        atom.c \
-       keysym.c
+       keysym.c \
+       text.c

diff --git a/src/text.c b/src/text.c
new file mode 100644 (file)
index 0000000..139bdc7
--- /dev/null
+++ b/src/text.c
@@ -0,0 +1,92 @@
+/************************************************************
+ 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.
+
+ ********************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "X11/extensions/XKBcommon.h"
+
+char *
+XkbConfigText(unsigned config)
+{
+    switch (config) {
+    case XkmSemanticsFile:
+        return "Semantics";
+    case XkmLayoutFile:
+        return "Layout";
+    case XkmKeymapFile:
+        return "Keymap";
+    case XkmGeometryFile:
+    case XkmGeometryIndex:
+        return "Geometry";
+    case XkmTypesIndex:
+        return "Types";
+    case XkmCompatMapIndex:
+        return "CompatMap";
+    case XkmSymbolsIndex:
+        return "Symbols";
+    case XkmIndicatorsIndex:
+        return "Indicators";
+    case XkmKeyNamesIndex:
+        return "KeyNames";
+    case XkmVirtualModsIndex:
+        return "VirtualMods";
+    default:
+        return "unknown";
+    }
+}
+
+static char *actionTypeNames[XkbSA_NumActions]= {
+    "NoAction",         /* XkbSA_NoAction */
+    "SetMods",          /* XkbSA_SetMods */
+    "LatchMods",        /* XkbSA_LatchMods */
+    "LockMods",         /* XkbSA_LockMods */
+    "SetGroup",         /* XkbSA_SetGroup */
+    "LatchGroup",       /* XkbSA_LatchGroup */
+    "LockGroup",        /* XkbSA_LockGroup */
+    "MovePtr",          /* XkbSA_MovePtr */
+    "PtrBtn",           /* XkbSA_PtrBtn */
+    "LockPtrBtn",       /* XkbSA_LockPtrBtn */
+    "SetPtrDflt",       /* XkbSA_SetPtrDflt */
+    "ISOLock",          /* XkbSA_ISOLock */
+    "Terminate",        /* XkbSA_Terminate */
+    "SwitchScreen",     /* XkbSA_SwitchScreen */
+    "SetControls",      /* XkbSA_SetControls */
+    "LockControls",     /* XkbSA_LockControls */
+    "ActionMessage",    /* XkbSA_ActionMessage */
+    "RedirectKey",      /* XkbSA_RedirectKey */
+    "DeviceBtn",        /* XkbSA_DeviceBtn */
+    "LockDeviceBtn",    /* XkbSA_LockDeviceBtn */
+    "DeviceValuator"    /* XkbSA_DeviceValuator */
+};
+
+char *
+XkbActionTypeText(unsigned type)
+{
+    if (type <= XkbSA_LastAction)
+        return actionTypeNames[type];
+    return "Private";
+}

diff --git a/src/xkbcomp/misc.c b/src/xkbcomp/misc.c
index 116de6f..de0f667 100644 (file)
--- a/src/xkbcomp/misc.c
+++ b/src/xkbcomp/misc.c
@@ -572,57 +572,3 @@ FindKeyNameForAlias(XkbcDescPtr xkb, unsigned long lname,
     }
     return False;
 }
-
-char *
-XkbConfigText(unsigned config)
-{
-    switch (config) {
-    case XkmSemanticsFile:
-        return "Semantics";
-    case XkmLayoutFile:
-        return "Layout";
-    case XkmKeymapFile:
-        return "Keymap";
-    case XkmGeometryFile:
-    case XkmGeometryIndex:
-        return "Geometry";
-    case XkmTypesIndex:
-        return "Types";
-    case XkmCompatMapIndex:
-        return "CompatMap";
-    case XkmSymbolsIndex:
-        return "Symbols";
-    case XkmIndicatorsIndex:
-        return "Indicators";
-    case XkmKeyNamesIndex:
-        return "KeyNames";
-    case XkmVirtualModsIndex:
-        return "VirtualMods";
-    default:
-        return "unknown";
-    }
-}
-
-static char *actionTypeNames[XkbSA_NumActions]= {
-    "NoAction",
-    "SetMods",      "LatchMods",    "LockMods",
-    "SetGroup",     "LatchGroup",   "LockGroup",
-    "MovePtr",
-    "PtrBtn",       "LockPtrBtn",
-    "SetPtrDflt",
-    "ISOLock",
-    "Terminate",    "SwitchScreen",
-    "SetControls",  "LockControls",
-    "ActionMessage",
-    "RedirectKey",
-    "DeviceBtn",    "LockDeviceBtn"
-};
-
-char *
-XkbActionTypeText(unsigned type)
-{
-
-    if (type <= XkbSA_LastAction)
-        return actionTypeNames[type];
-    return "Private";
-}

diff --git a/src/xkbcomp/misc.h b/src/xkbcomp/misc.h
index a440c7c..2ec9e7a 100644 (file)
--- a/src/xkbcomp/misc.h
+++ b/src/xkbcomp/misc.h
@@ -108,10 +108,4 @@ extern Bool FindKeyNameForAlias(XkbcDescPtr /* xkb */ ,
                                 unsigned long * /* real_name */
     );
 
-extern char *
-XkbConfigText(unsigned config);
-
-extern char *
-XkbActionTypeText(unsigned type);
-
 #endif /* MISC_H */