Hash :
7891c917
Author :
Date :
2012-11-05T21:34:59
keysym-utf: also translate special keysyms like Tab and Return The keysym2ucs.c file apparently leaves out some keysyms, which libX11 deals with separately (like in _XkbHandleSpecialSym()). The problematic keysyms are the keypad ones (for which we already added some support) and keysyms which use 0xff** instead of 0x00** < 0x20. This code should fix them properly, as much as I could gather from libX11 and http://www.cl.cam.ac.uk/~mgk25/ucs/keysym2ucs.c and other sources (which are not aware of locale). https://bugs.freedesktop.org/show_bug.cgi?id=56780 Reported-by: Gatis Paeglis <gatis.paeglis@digia.com> Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183
/*
* 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.
*/
#include "test.h"
#include "keysym.h" /* For unexported is_lower/upper/keypad() */
static int
test_string(const char *string, xkb_keysym_t expected)
{
xkb_keysym_t keysym;
keysym = xkb_keysym_from_name(string, 0);
fprintf(stderr, "Expected string %s -> %x\n", string, expected);
fprintf(stderr, "Received string %s -> %x\n\n", string, keysym);
return keysym == expected;
}
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;
}
static int
test_keysym(xkb_keysym_t keysym, const char *expected)
{
char s[16];
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);
return streq(s, expected);
}
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;
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));
return streq(s, expected);
}
int
main(void)
{
assert(test_string("Undo", 0xFF65));
assert(test_string("ThisKeyShouldNotExist", XKB_KEY_NoSymbol));
assert(test_string("XF86_Switch_VT_5", 0x1008FE05));
assert(test_string("VoidSymbol", 0xFFFFFF));
assert(test_string("U4567", 0x1004567));
assert(test_string("0x10203040", 0x10203040));
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));
assert(test_keysym(0x1008FF56, "XF86Close"));
assert(test_keysym(0x0, "NoSymbol"));
assert(test_keysym(0x1008FE20, "XF86Ungrab"));
assert(test_keysym(0x01001234, "U1234"));
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));
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, "ش"));
assert(test_utf8(XKB_KEY_space, " "));
assert(test_utf8(XKB_KEY_KP_Space, " "));
assert(test_utf8(XKB_KEY_BackSpace, "\b"));
assert(test_utf8(XKB_KEY_Escape, "\e"));
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, "="));
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, "-"));
assert(xkb_keysym_is_lower(XKB_KEY_a));
assert(xkb_keysym_is_lower(XKB_KEY_Greek_lambda));
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 */
assert(xkb_keysym_is_upper(XKB_KEY_A));
assert(xkb_keysym_is_upper(XKB_KEY_Greek_LAMBDA));
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 */
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));
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 */
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));
return 0;
}