StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keysym: Fix conversion for Unicode and bare numbers 

Ensure that Unicode string representations are accepted and turned into
numbers, as well as hexadecimal numbers in 0xabcd1234 form; unknown
keysyms are output as 0xabcd1234 in string form.

This also ensures that strings are never returned malloc()ed.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
master
Daniel Stone 2009-04-25 14:42:42 +10:00
parent 8e3239a78f
commit cdc735c8ca
1 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/keysym.c
View File

@ -54,6 +54,7 @@ XkbcKeysymToString(KeySym ks)
return ret;
}
/* Try to find it in our hash table. */
if (ks <= 0x1fffffff) {
val1 = ks >> 24;
val2 = (ks >> 16) & 0xff;
@ -79,35 +80,15 @@ XkbcKeysymToString(KeySym ks)
}
}
/* Unnamed Unicode codepoint. */
if (ks >= 0x01000100 && ks <= 0x0110ffff) {
KeySym val = ks & 0xffffff;
char *s;
int i;
if (val & 0xff0000)
i = 10;
else
i = 6;
s = malloc(i);
if (!s)
return s;
i--;
s[i--] = '\0';
for (; i; i--) {
val1 = val & 0xf;
val >>= 4;
if (val1 < 10)
s[i] = '0' + val1;
else
s[i] = 'A' + val1 - 10;
}
s[i] = 'U';
return s;
sprintf(ret, "U%lx", ks & 0xffffffUL);
return ret;
}
return NULL;
/* Unnamed, non-Unicode, symbol (shouldn't generally happen). */
sprintf(ret, "0x%08lx", ks);
return ret;
}
KeySym
@ -151,30 +132,19 @@ XkbcStringToKeysym(const char *s)
}
if (*s == 'U') {
val = 0;
for (p = &s[1]; *p; p++) {
c = *p;
if ('0' <= c && c <= '9')
val = (val << 4) + c - '0';
else if ('a' <= c && c <= 'f')
val = (val << 4) + c - 'a' + 10;
else if ('A' <= c && c <= 'F')
val = (val << 4) + c - 'A' + 10;
else
return NoSymbol;
if (val > 0x10ffff)
return NoSymbol;
}
val = strtoul(&s[1], NULL, 16);
if (val < 0x20 || (val > 0x7e && val < 0xa0))
return NoSymbol;
if (val < 0x100)
return val;
if (val > 0x10ffff)
return NoSymbol;
return val | 0x01000000;
}
else if (s[0] == '0' && s[1] == 'x') {
return strtoul(&s[2], NULL, 16);
}
return NoSymbol;
}