typedef const char *(*GetAtomValueFuncPtr)(uint32_t atom);
_X_EXPORT extern void
-XkbcInitAtoms(InternAtomFuncPtr intern, GetAtomValueFuncPtr get_atom_value);
+xkb_init_atoms(InternAtomFuncPtr intern, GetAtomValueFuncPtr get_atom_value);
_X_EXPORT extern struct xkb_desc *
-XkbcCompileKeymapFromRules(const XkbRMLVOSet *rmlvo);
+xkb_compile_keymap_from_rules(const XkbRMLVOSet *rmlvo);
_X_EXPORT extern struct xkb_desc *
-XkbcCompileKeymapFromComponents(const struct xkb_component_names * ktcsg);
+xkb_compile_keymap_from_components(const struct xkb_component_names * ktcsg);
_X_EXPORT extern struct xkb_desc *
-XkbcCompileKeymapFromFile(FILE *inputFile, const char *mapName);
+xkb_compile_keymap_from_file(FILE *inputFile, const char *mapName);
_X_EXPORT extern struct xkb_component_list *
-XkbcListComponents(struct xkb_component_names * ptrns, int *maxMatch);
+xkb_list_components(struct xkb_component_names * ptrns, int *maxMatch);
/*
* Canonicalises component names by prepending the relevant component from
* free()d, and a new one allocated with malloc().
*/
_X_EXPORT extern void
-XkbcCanonicaliseComponents(struct xkb_component_names * names,
+xkb_canonicalise_components(struct xkb_component_names * names,
const struct xkb_component_names * old);
/*
* as "Ua1b2", and other unknown keysyms as "0xabcd1234".
*
* The string returned may become invalidated after the next call to
- * XkbcKeysymToString: if you need to preserve it, then you must
+ * xkb_keysym_to_string: if you need to preserve it, then you must
* duplicate it.
*
* This is uint32_t rather than KeySym, as KeySym changes size between
* client and server (no, really).
*/
_X_EXPORT extern char *
-XkbcKeysymToString(uint32_t ks);
+xkb_keysym_to_string(uint32_t ks);
/*
- * See XkbcKeysymToString comments: this function will accept any string
+ * See xkb_keysym_to_string comments: this function will accept any string
* from that function.
*/
_X_EXPORT extern uint32_t
-XkbcStringToKeysym(const char *s);
+xkb_string_to_keysym(const char *s);
_XFUNCPROTOEND
GetAtomValueFuncPtr do_get_atom_value = NULL;
void
-XkbcInitAtoms(InternAtomFuncPtr intern, GetAtomValueFuncPtr get_atom_value)
+xkb_init_atoms(InternAtomFuncPtr intern, GetAtomValueFuncPtr get_atom_value)
{
if (intern && get_atom_value) {
if (do_intern_atom && do_get_atom_value)
#include "ks_tables.h"
char *
-XkbcKeysymToString(uint32_t ks)
+xkb_keysym_to_string(uint32_t ks)
{
int i, n, h, idx;
const unsigned char *entry;
}
uint32_t
-XkbcStringToKeysym(const char *s)
+xkb_string_to_keysym(const char *s)
{
int i, n, h, c, idx;
unsigned long sig = 0;
char *
XkbcKeysymText(uint32_t sym)
{
- return XkbcKeysymToString(sym);
+ return xkb_keysym_to_string(sym);
}
char *
}
void
-XkbcCanonicaliseComponents(struct xkb_component_names * names,
+xkb_canonicalise_components(struct xkb_component_names * names,
const struct xkb_component_names * old)
{
names->keycodes = XkbcCanonicaliseComponent(names->keycodes,
{
const char *str;
str = XkbcAtomText(expr->value.str);
- if ((str != NULL) && ((sym = XkbcStringToKeysym(str)) != NoSymbol))
+ if ((str != NULL) && ((sym = xkb_string_to_keysym(str)) != NoSymbol))
{
val_rtrn->uval = sym;
return True;
/***====================================================================***/
struct xkb_component_list *
-XkbcListComponents(struct xkb_component_names * ptrns, int *maxMatch)
+xkb_list_components(struct xkb_component_names * ptrns, int *maxMatch)
{
struct xkb_component_list * complist = NULL;
int extra = 0;
*sym_rtrn = XK_VoidSymbol;
return 1;
}
- sym = XkbcStringToKeysym(str);
+ sym = xkb_string_to_keysym(str);
if (sym != NoSymbol)
{
*sym_rtrn = sym;
}
struct xkb_desc *
-XkbcCompileKeymapFromRules(const XkbRMLVOSet *rmlvo)
+xkb_compile_keymap_from_rules(const XkbRMLVOSet *rmlvo)
{
XkbRF_VarDefsRec defs;
struct xkb_component_names * names;
return NULL;
}
- xkb = XkbcCompileKeymapFromComponents(names);
+ xkb = xkb_compile_keymap_from_components(names);
free(names->keymap);
free(names->keycodes);
}
struct xkb_desc *
-XkbcCompileKeymapFromComponents(const struct xkb_component_names * ktcsg)
+xkb_compile_keymap_from_components(const struct xkb_component_names * ktcsg)
{
XkbFile *file, *mapToUse;
struct xkb_desc * xkb;
}
struct xkb_desc *
-XkbcCompileKeymapFromFile(FILE *inputFile, const char *mapName)
+xkb_compile_keymap_from_file(FILE *inputFile, const char *mapName)
{
XkbFile *file, *mapToUse;
struct xkb_desc * xkb;
old->types = strdup(argv[10]);
}
- XkbcCanonicaliseComponents(new, old);
+ xkb_canonicalise_components(new, old);
printf("%s %s %s %s %s\n", new->keycodes, new->compat, new->geometry,
new->symbols, new->types);
exit(1);
}
- xkb = XkbcCompileKeymapFromFile(file, name);
+ xkb = xkb_compile_keymap_from_file(file, name);
fclose(file);
if (!xkb) {
ktcsg.symbols = argv[4];
ktcsg.geometry = argv[5];
- xkb = XkbcCompileKeymapFromComponents(&ktcsg);
+ xkb = xkb_compile_keymap_from_components(&ktcsg);
if (!xkb) {
fprintf(stderr, "Failed to compile keymap\n");
rmlvo.variant = argv[4];
rmlvo.options = argv[5];
- xkb = XkbcCompileKeymapFromRules(&rmlvo);
+ xkb = xkb_compile_keymap_from_rules(&rmlvo);
if (!xkb) {
fprintf(stderr, "Failed to compile keymap\n");
static void print_keysym(const char *s)
{
- KeySym ks = XkbcStringToKeysym(s);
+ KeySym ks = xkb_string_to_keysym(s);
if (ks == NoSymbol)
printf("NoSymbol\n");
else
static void print_string(KeySym ks)
{
- char *s = XkbcKeysymToString(ks);
+ char *s = xkb_keysym_to_string(ks);
printf("%s\n", s ? s : "NULL");
}