Change them to refer to the string representation of the keysym's name
as a name rather than a string, since we want to add API to get the
Unicode printable representation as well.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
const struct xkb_component_names *old);
/*
const struct xkb_component_names *old);
/*
- * Converts a keysym to a string; will return unknown Unicode codepoints
- * as "Ua1b2", and other unknown keysyms as "0xabcd1234".
+ * Returns the name for a keysym as a string; will return unknown Unicode
+ * codepoints as "Ua1b2", and other unknown keysyms as "0xabcd1234".
-xkb_keysym_to_string(xkb_keysym_t ks, char *buffer, size_t size);
+xkb_keysym_get_name(xkb_keysym_t ks, char *buffer, size_t size);
/*
* See xkb_keysym_to_string comments: this function will accept any string
* from that function.
*/
xkb_keysym_t
/*
* See xkb_keysym_to_string comments: this function will accept any string
* from that function.
*/
xkb_keysym_t
-xkb_string_to_keysym(const char *s);
+xkb_keysym_from_name(const char *s);
/**
* @defgroup ctx XKB contexts
/**
* @defgroup ctx XKB contexts
#include "ks_tables.h"
_X_EXPORT void
#include "ks_tables.h"
_X_EXPORT void
-xkb_keysym_to_string(xkb_keysym_t ks, char *buffer, size_t size)
+xkb_keysym_get_name(xkb_keysym_t ks, char *buffer, size_t size)
{
int i, n, h, idx;
const unsigned char *entry;
{
int i, n, h, idx;
const unsigned char *entry;
-xkb_string_to_keysym(const char *s)
+xkb_keysym_from_name(const char *s)
{
int i, n, h, c, idx;
uint32_t sig = 0;
{
int i, n, h, c, idx;
uint32_t sig = 0;
if (!tmp)
return XKB_KEYSYM_NO_SYMBOL;
memmove(&tmp[4], &tmp[5], strlen(s) - 5 + 1);
if (!tmp)
return XKB_KEYSYM_NO_SYMBOL;
memmove(&tmp[4], &tmp[5], strlen(s) - 5 + 1);
- ret = xkb_string_to_keysym(tmp);
+ ret = xkb_keysym_from_name(tmp);
{
static char buffer[16];
{
static char buffer[16];
- xkb_keysym_to_string(sym, buffer, sizeof buffer);
+ xkb_keysym_get_name(sym, buffer, sizeof buffer);
const char *str;
str = XkbcAtomText(expr->value.str);
if (str) {
const char *str;
str = XkbcAtomText(expr->value.str);
if (str) {
- sym = xkb_string_to_keysym(str);
+ sym = xkb_keysym_from_name(str);
if (sym != XKB_KEYSYM_NO_SYMBOL) {
val_rtrn->uval = sym;
return true;
if (sym != XKB_KEYSYM_NO_SYMBOL) {
val_rtrn->uval = sym;
return true;
*sym_rtrn = XK_VoidSymbol;
return 1;
}
*sym_rtrn = XK_VoidSymbol;
return 1;
}
- sym = xkb_string_to_keysym(str);
+ sym = xkb_keysym_from_name(str);
if (sym != XKB_KEYSYM_NO_SYMBOL)
{
*sym_rtrn = sym;
if (sym != XKB_KEYSYM_NO_SYMBOL)
{
*sym_rtrn = sym;
- keysym = xkb_string_to_keysym(string);
+ keysym = xkb_keysym_from_name(string);
fprintf(stderr, "Expected string %s -> %x\n", string, expected);
fprintf(stderr, "Received string %s -> %x\n\n", string, keysym);
fprintf(stderr, "Expected string %s -> %x\n", string, expected);
fprintf(stderr, "Received string %s -> %x\n\n", string, keysym);
- xkb_keysym_to_string(keysym, s, sizeof(s));
+ xkb_keysym_get_name(keysym, s, sizeof(s));
fprintf(stderr, "Expected keysym %#x -> %s\n", keysym, expected);
fprintf(stderr, "Received keysym %#x -> %s\n\n", keysym, s);
fprintf(stderr, "Expected keysym %#x -> %s\n", keysym, expected);
fprintf(stderr, "Received keysym %#x -> %s\n\n", keysym, s);