2012-09-12 09:54:07 -06:00
|
|
|
|
/*
|
|
|
|
|
* 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 (including the next
|
|
|
|
|
* paragraph) 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 OR COPYRIGHT HOLDERS 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.
|
|
|
|
|
*/
|
keysym: fix locale dependence in xkb_keysym_from_name()
We currently use strcasecmp, which is locale-dependent. In particular,
one well-known surprise even if restricted just ASCII input is found in
the tr_TR (Turkish) locale, see e.g.
https://msdn.microsoft.com/en-us/library/ms973919.aspx#stringsinnet20_topic5
We have known to avoid locale-dependent functions before, but in this
case, we forgot.
Fix it by implementing our own simple ASCII-only strcasecmp/strncasecmp.
Might have been possible to use strcasecmp_l() with the C locale, but
went the easy route.
Side advantage is that even this non-optimized version is faster than
the optimized libc one (__strcasecmp_l_sse42) since it doesn't need to
do the locale stuff. xkb_keysym_from_name(), which uses strcasecmp
heavily, becomes faster, and so for example Compose file parsing, which
uses xkb_keysym_from_name() heavily, becomes ~20% faster.
Resolves https://github.com/xkbcommon/libxkbcommon/issues/42
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-12-02 13:15:19 -07:00
|
|
|
|
#include <locale.h>
|
2012-09-12 09:54:07 -06:00
|
|
|
|
|
2012-07-24 10:54:14 -06:00
|
|
|
|
#include "test.h"
|
2012-10-09 12:48:35 -06:00
|
|
|
|
#include "keysym.h" /* For unexported is_lower/upper/keypad() */
|
2012-03-30 17:44:39 -06:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
test_string(const char *string, xkb_keysym_t expected)
|
2009-01-20 19:57:22 -07:00
|
|
|
|
{
|
2012-03-30 17:44:39 -06:00
|
|
|
|
xkb_keysym_t keysym;
|
|
|
|
|
|
2012-10-16 08:05:34 -06:00
|
|
|
|
keysym = xkb_keysym_from_name(string, 0);
|
2012-03-30 17:44:39 -06:00
|
|
|
|
|
|
|
|
|
fprintf(stderr, "Expected string %s -> %x\n", string, expected);
|
|
|
|
|
fprintf(stderr, "Received string %s -> %x\n\n", string, keysym);
|
|
|
|
|
|
|
|
|
|
return keysym == expected;
|
2009-01-20 19:57:22 -07:00
|
|
|
|
}
|
|
|
|
|
|
2012-10-16 08:05:34 -06:00
|
|
|
|
static int
|
|
|
|
|
test_casestring(const char *string, xkb_keysym_t expected)
|
|
|
|
|
{
|
|
|
|
|
xkb_keysym_t keysym;
|
|
|
|
|
|
|
|
|
|
keysym = xkb_keysym_from_name(string, XKB_KEYSYM_CASE_INSENSITIVE);
|
|
|
|
|
|
|
|
|
|
fprintf(stderr, "Expected casestring %s -> %x\n", string, expected);
|
|
|
|
|
fprintf(stderr, "Received casestring %s -> %x\n\n", string, keysym);
|
|
|
|
|
|
|
|
|
|
return keysym == expected;
|
|
|
|
|
}
|
|
|
|
|
|
2012-03-30 17:44:39 -06:00
|
|
|
|
static int
|
|
|
|
|
test_keysym(xkb_keysym_t keysym, const char *expected)
|
2009-01-20 19:57:22 -07:00
|
|
|
|
{
|
2010-10-08 13:33:18 -06:00
|
|
|
|
char s[16];
|
|
|
|
|
|
2012-05-09 06:22:34 -06:00
|
|
|
|
xkb_keysym_get_name(keysym, s, sizeof(s));
|
2012-03-30 17:44:39 -06:00
|
|
|
|
|
|
|
|
|
fprintf(stderr, "Expected keysym %#x -> %s\n", keysym, expected);
|
|
|
|
|
fprintf(stderr, "Received keysym %#x -> %s\n\n", keysym, s);
|
|
|
|
|
|
2012-07-24 10:54:14 -06:00
|
|
|
|
return streq(s, expected);
|
2009-01-20 19:57:22 -07:00
|
|
|
|
}
|
|
|
|
|
|
2012-06-08 06:10:28 -06:00
|
|
|
|
static int
|
|
|
|
|
test_utf8(xkb_keysym_t keysym, const char *expected)
|
|
|
|
|
{
|
|
|
|
|
char s[8];
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
ret = xkb_keysym_to_utf8(keysym, s, sizeof(s));
|
|
|
|
|
if (ret <= 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2012-11-05 12:34:59 -07:00
|
|
|
|
fprintf(stderr, "Expected keysym %#x -> %s (%u bytes)\n", keysym, expected,
|
|
|
|
|
(unsigned) strlen(expected));
|
|
|
|
|
fprintf(stderr, "Received keysym %#x -> %s (%u bytes)\n\n", keysym, s,
|
|
|
|
|
(unsigned) strlen(s));
|
2012-06-08 06:10:28 -06:00
|
|
|
|
|
2018-06-23 13:00:19 -06:00
|
|
|
|
assert(expected != NULL);
|
2012-07-24 10:54:14 -06:00
|
|
|
|
return streq(s, expected);
|
2012-06-08 06:10:28 -06:00
|
|
|
|
}
|
|
|
|
|
|
keysym: fix locale dependence in xkb_keysym_from_name()
We currently use strcasecmp, which is locale-dependent. In particular,
one well-known surprise even if restricted just ASCII input is found in
the tr_TR (Turkish) locale, see e.g.
https://msdn.microsoft.com/en-us/library/ms973919.aspx#stringsinnet20_topic5
We have known to avoid locale-dependent functions before, but in this
case, we forgot.
Fix it by implementing our own simple ASCII-only strcasecmp/strncasecmp.
Might have been possible to use strcasecmp_l() with the C locale, but
went the easy route.
Side advantage is that even this non-optimized version is faster than
the optimized libc one (__strcasecmp_l_sse42) since it doesn't need to
do the locale stuff. xkb_keysym_from_name(), which uses strcasecmp
heavily, becomes faster, and so for example Compose file parsing, which
uses xkb_keysym_from_name() heavily, becomes ~20% faster.
Resolves https://github.com/xkbcommon/libxkbcommon/issues/42
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-12-02 13:15:19 -07:00
|
|
|
|
static void
|
|
|
|
|
test_github_issue_42(void)
|
|
|
|
|
{
|
|
|
|
|
// Verify we are not dependent on locale, Turkish-i problem in particular.
|
|
|
|
|
if (setlocale(LC_CTYPE, "tr_TR.UTF-8") == NULL) {
|
|
|
|
|
// The locale is not available, probably; skip.
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
assert(test_string("i", XKB_KEY_i));
|
|
|
|
|
assert(test_string("I", XKB_KEY_I));
|
|
|
|
|
assert(test_casestring("i", XKB_KEY_i));
|
|
|
|
|
assert(test_casestring("I", XKB_KEY_i));
|
|
|
|
|
assert(xkb_keysym_to_upper(XKB_KEY_i) == XKB_KEY_I);
|
|
|
|
|
assert(xkb_keysym_to_lower(XKB_KEY_I) == XKB_KEY_i);
|
|
|
|
|
|
|
|
|
|
setlocale(LC_CTYPE, "C");
|
|
|
|
|
}
|
|
|
|
|
|
2012-03-30 17:44:39 -06:00
|
|
|
|
int
|
|
|
|
|
main(void)
|
2009-01-20 19:57:22 -07:00
|
|
|
|
{
|
2012-03-30 17:44:39 -06:00
|
|
|
|
assert(test_string("Undo", 0xFF65));
|
2012-05-09 07:05:00 -06:00
|
|
|
|
assert(test_string("ThisKeyShouldNotExist", XKB_KEY_NoSymbol));
|
2012-03-30 17:44:39 -06:00
|
|
|
|
assert(test_string("XF86_Switch_VT_5", 0x1008FE05));
|
|
|
|
|
assert(test_string("VoidSymbol", 0xFFFFFF));
|
|
|
|
|
assert(test_string("U4567", 0x1004567));
|
|
|
|
|
assert(test_string("0x10203040", 0x10203040));
|
2012-10-16 08:05:34 -06:00
|
|
|
|
assert(test_string("a", 0x61));
|
|
|
|
|
assert(test_string("A", 0x41));
|
|
|
|
|
assert(test_string("ch", 0xfea0));
|
|
|
|
|
assert(test_string("Ch", 0xfea1));
|
|
|
|
|
assert(test_string("CH", 0xfea2));
|
|
|
|
|
assert(test_string("THORN", 0x00de));
|
|
|
|
|
assert(test_string("Thorn", 0x00de));
|
|
|
|
|
assert(test_string("thorn", 0x00fe));
|
2012-03-30 17:44:39 -06:00
|
|
|
|
|
|
|
|
|
assert(test_keysym(0x1008FF56, "XF86Close"));
|
|
|
|
|
assert(test_keysym(0x0, "NoSymbol"));
|
|
|
|
|
assert(test_keysym(0x1008FE20, "XF86Ungrab"));
|
|
|
|
|
assert(test_keysym(0x01001234, "U1234"));
|
2013-02-19 06:57:14 -07:00
|
|
|
|
/* 16-bit unicode padded to width 4. */
|
|
|
|
|
assert(test_keysym(0x010002DE, "U02DE"));
|
|
|
|
|
/* 32-bit unicode padded to width 8. */
|
|
|
|
|
assert(test_keysym(0x0101F4A9, "U0001F4A9"));
|
2009-01-20 19:57:22 -07:00
|
|
|
|
|
2012-10-16 08:05:34 -06:00
|
|
|
|
assert(test_casestring("Undo", 0xFF65));
|
|
|
|
|
assert(test_casestring("UNDO", 0xFF65));
|
|
|
|
|
assert(test_casestring("A", 0x61));
|
|
|
|
|
assert(test_casestring("a", 0x61));
|
|
|
|
|
assert(test_casestring("ThisKeyShouldNotExist", XKB_KEY_NoSymbol));
|
|
|
|
|
assert(test_casestring("XF86_Switch_vT_5", 0x1008FE05));
|
|
|
|
|
assert(test_casestring("xF86_SwitcH_VT_5", 0x1008FE05));
|
|
|
|
|
assert(test_casestring("xF86SwiTch_VT_5", 0x1008FE05));
|
|
|
|
|
assert(test_casestring("xF86Switch_vt_5", 0x1008FE05));
|
|
|
|
|
assert(test_casestring("VoidSymbol", 0xFFFFFF));
|
|
|
|
|
assert(test_casestring("vOIDsymBol", 0xFFFFFF));
|
|
|
|
|
assert(test_casestring("U4567", 0x1004567));
|
|
|
|
|
assert(test_casestring("u4567", 0x1004567));
|
|
|
|
|
assert(test_casestring("0x10203040", 0x10203040));
|
|
|
|
|
assert(test_casestring("0X10203040", 0x10203040));
|
|
|
|
|
assert(test_casestring("THORN", 0x00fe));
|
|
|
|
|
assert(test_casestring("Thorn", 0x00fe));
|
|
|
|
|
assert(test_casestring("thorn", 0x00fe));
|
|
|
|
|
|
2012-06-08 06:10:28 -06:00
|
|
|
|
assert(test_utf8(XKB_KEY_y, "y"));
|
|
|
|
|
assert(test_utf8(XKB_KEY_u, "u"));
|
|
|
|
|
assert(test_utf8(XKB_KEY_m, "m"));
|
|
|
|
|
assert(test_utf8(XKB_KEY_Cyrillic_em, "м"));
|
|
|
|
|
assert(test_utf8(XKB_KEY_Cyrillic_u, "у"));
|
|
|
|
|
assert(test_utf8(XKB_KEY_exclam, "!"));
|
|
|
|
|
assert(test_utf8(XKB_KEY_oslash, "ø"));
|
|
|
|
|
assert(test_utf8(XKB_KEY_hebrew_aleph, "א"));
|
|
|
|
|
assert(test_utf8(XKB_KEY_Arabic_sheen, "ش"));
|
|
|
|
|
|
2012-06-08 07:54:31 -06:00
|
|
|
|
assert(test_utf8(XKB_KEY_space, " "));
|
|
|
|
|
assert(test_utf8(XKB_KEY_KP_Space, " "));
|
2012-11-05 12:34:59 -07:00
|
|
|
|
assert(test_utf8(XKB_KEY_BackSpace, "\b"));
|
2012-11-07 09:58:18 -07:00
|
|
|
|
assert(test_utf8(XKB_KEY_Escape, "\033"));
|
2012-11-05 12:34:59 -07:00
|
|
|
|
assert(test_utf8(XKB_KEY_KP_Separator, ","));
|
|
|
|
|
assert(test_utf8(XKB_KEY_KP_Decimal, "."));
|
|
|
|
|
assert(test_utf8(XKB_KEY_Tab, "\t"));
|
|
|
|
|
assert(test_utf8(XKB_KEY_KP_Tab, "\t"));
|
|
|
|
|
assert(test_utf8(XKB_KEY_hyphen, ""));
|
|
|
|
|
assert(test_utf8(XKB_KEY_Linefeed, "\n"));
|
|
|
|
|
assert(test_utf8(XKB_KEY_Return, "\r"));
|
|
|
|
|
assert(test_utf8(XKB_KEY_KP_Enter, "\r"));
|
|
|
|
|
assert(test_utf8(XKB_KEY_KP_Equal, "="));
|
2012-06-08 07:54:31 -06:00
|
|
|
|
assert(test_utf8(XKB_KEY_9, "9"));
|
|
|
|
|
assert(test_utf8(XKB_KEY_KP_9, "9"));
|
|
|
|
|
assert(test_utf8(XKB_KEY_KP_Multiply, "*"));
|
|
|
|
|
assert(test_utf8(XKB_KEY_KP_Subtract, "-"));
|
|
|
|
|
|
2018-06-23 13:00:19 -06:00
|
|
|
|
assert(test_utf8(0x10005d0, "א"));
|
|
|
|
|
assert(test_utf8(0x110ffff, "\xf4\x8f\xbf\xbf"));
|
|
|
|
|
assert(test_utf8(0x1110000, NULL) == 0);
|
|
|
|
|
|
2012-10-09 12:48:35 -06:00
|
|
|
|
assert(xkb_keysym_is_lower(XKB_KEY_a));
|
|
|
|
|
assert(xkb_keysym_is_lower(XKB_KEY_Greek_lambda));
|
2012-10-16 08:05:34 -06:00
|
|
|
|
assert(xkb_keysym_is_lower(xkb_keysym_from_name("U03b1", 0))); /* GREEK SMALL LETTER ALPHA */
|
|
|
|
|
assert(xkb_keysym_is_lower(xkb_keysym_from_name("U03af", 0))); /* GREEK SMALL LETTER IOTA WITH TONOS */
|
2012-10-09 12:48:35 -06:00
|
|
|
|
|
|
|
|
|
assert(xkb_keysym_is_upper(XKB_KEY_A));
|
|
|
|
|
assert(xkb_keysym_is_upper(XKB_KEY_Greek_LAMBDA));
|
2012-10-16 08:05:34 -06:00
|
|
|
|
assert(xkb_keysym_is_upper(xkb_keysym_from_name("U0391", 0))); /* GREEK CAPITAL LETTER ALPHA */
|
|
|
|
|
assert(xkb_keysym_is_upper(xkb_keysym_from_name("U0388", 0))); /* GREEK CAPITAL LETTER EPSILON WITH TONOS */
|
2012-10-09 12:48:35 -06:00
|
|
|
|
|
|
|
|
|
assert(!xkb_keysym_is_upper(XKB_KEY_a));
|
|
|
|
|
assert(!xkb_keysym_is_lower(XKB_KEY_A));
|
|
|
|
|
assert(!xkb_keysym_is_lower(XKB_KEY_Return));
|
|
|
|
|
assert(!xkb_keysym_is_upper(XKB_KEY_Return));
|
|
|
|
|
assert(!xkb_keysym_is_lower(XKB_KEY_hebrew_aleph));
|
|
|
|
|
assert(!xkb_keysym_is_upper(XKB_KEY_hebrew_aleph));
|
2012-10-16 08:05:34 -06:00
|
|
|
|
assert(!xkb_keysym_is_upper(xkb_keysym_from_name("U05D0", 0))); /* HEBREW LETTER ALEF */
|
|
|
|
|
assert(!xkb_keysym_is_lower(xkb_keysym_from_name("U05D0", 0))); /* HEBREW LETTER ALEF */
|
2012-10-09 12:48:35 -06:00
|
|
|
|
assert(!xkb_keysym_is_lower(XKB_KEY_8));
|
|
|
|
|
assert(!xkb_keysym_is_upper(XKB_KEY_8));
|
|
|
|
|
|
|
|
|
|
assert(xkb_keysym_is_keypad(XKB_KEY_KP_Enter));
|
|
|
|
|
assert(xkb_keysym_is_keypad(XKB_KEY_KP_6));
|
|
|
|
|
assert(xkb_keysym_is_keypad(XKB_KEY_KP_Add));
|
|
|
|
|
assert(!xkb_keysym_is_keypad(XKB_KEY_Num_Lock));
|
|
|
|
|
assert(!xkb_keysym_is_keypad(XKB_KEY_1));
|
|
|
|
|
assert(!xkb_keysym_is_keypad(XKB_KEY_Return));
|
|
|
|
|
|
2013-08-13 09:52:46 -06:00
|
|
|
|
assert(xkb_keysym_to_upper(XKB_KEY_a) == XKB_KEY_A);
|
|
|
|
|
assert(xkb_keysym_to_upper(XKB_KEY_A) == XKB_KEY_A);
|
|
|
|
|
assert(xkb_keysym_to_lower(XKB_KEY_a) == XKB_KEY_a);
|
|
|
|
|
assert(xkb_keysym_to_lower(XKB_KEY_A) == XKB_KEY_a);
|
|
|
|
|
assert(xkb_keysym_to_upper(XKB_KEY_Return) == XKB_KEY_Return);
|
|
|
|
|
assert(xkb_keysym_to_lower(XKB_KEY_Return) == XKB_KEY_Return);
|
|
|
|
|
assert(xkb_keysym_to_upper(XKB_KEY_Greek_lambda) == XKB_KEY_Greek_LAMBDA);
|
|
|
|
|
assert(xkb_keysym_to_upper(XKB_KEY_Greek_LAMBDA) == XKB_KEY_Greek_LAMBDA);
|
|
|
|
|
assert(xkb_keysym_to_lower(XKB_KEY_Greek_lambda) == XKB_KEY_Greek_lambda);
|
|
|
|
|
assert(xkb_keysym_to_lower(XKB_KEY_Greek_LAMBDA) == XKB_KEY_Greek_lambda);
|
|
|
|
|
assert(xkb_keysym_to_upper(XKB_KEY_eacute) == XKB_KEY_Eacute);
|
|
|
|
|
assert(xkb_keysym_to_lower(XKB_KEY_Eacute) == XKB_KEY_eacute);
|
|
|
|
|
|
keysym: fix locale dependence in xkb_keysym_from_name()
We currently use strcasecmp, which is locale-dependent. In particular,
one well-known surprise even if restricted just ASCII input is found in
the tr_TR (Turkish) locale, see e.g.
https://msdn.microsoft.com/en-us/library/ms973919.aspx#stringsinnet20_topic5
We have known to avoid locale-dependent functions before, but in this
case, we forgot.
Fix it by implementing our own simple ASCII-only strcasecmp/strncasecmp.
Might have been possible to use strcasecmp_l() with the C locale, but
went the easy route.
Side advantage is that even this non-optimized version is faster than
the optimized libc one (__strcasecmp_l_sse42) since it doesn't need to
do the locale stuff. xkb_keysym_from_name(), which uses strcasecmp
heavily, becomes faster, and so for example Compose file parsing, which
uses xkb_keysym_from_name() heavily, becomes ~20% faster.
Resolves https://github.com/xkbcommon/libxkbcommon/issues/42
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-12-02 13:15:19 -07:00
|
|
|
|
test_github_issue_42();
|
|
|
|
|
|
2009-01-20 19:57:22 -07:00
|
|
|
|
return 0;
|
|
|
|
|
}
|