version 1.28, 2015/11/12 11:05:34 |
version 1.29, 2015/11/12 22:04:37 |
|
|
u_short u; |
u_short u; |
int size; |
int size; |
key_code modifiers; |
key_code modifiers; |
struct utf8_data utf8data; |
struct utf8_data ud; |
u_int i; |
u_int i; |
|
|
/* Is this a hexadecimal value? */ |
/* Is this a hexadecimal value? */ |
|
|
return (KEYC_NONE); |
return (KEYC_NONE); |
} else { |
} else { |
/* Try as a UTF-8 key. */ |
/* Try as a UTF-8 key. */ |
if (utf8_open(&utf8data, (u_char)*string)) { |
if (utf8_open(&ud, (u_char)*string)) { |
if (strlen(string) != utf8data.size) |
if (strlen(string) != ud.size) |
return (KEYC_NONE); |
return (KEYC_NONE); |
for (i = 1; i < utf8data.size; i++) |
for (i = 1; i < ud.size; i++) |
utf8_append(&utf8data, (u_char)string[i]); |
utf8_append(&ud, (u_char)string[i]); |
key = utf8_combine(&utf8data); |
key = utf8_combine(&ud); |
return (key | modifiers); |
return (key | modifiers); |
} |
} |
|
|
|
|
static char out[24]; |
static char out[24]; |
char tmp[8]; |
char tmp[8]; |
u_int i; |
u_int i; |
struct utf8_data utf8data; |
struct utf8_data ud; |
|
|
*out = '\0'; |
*out = '\0'; |
|
|
|
|
|
|
/* Is this a UTF-8 key? */ |
/* Is this a UTF-8 key? */ |
if (key > 127 && key < KEYC_BASE) { |
if (key > 127 && key < KEYC_BASE) { |
if (utf8_split(key, &utf8data) == 0) { |
if (utf8_split(key, &ud) == 0) { |
memcpy(out, utf8data.data, utf8data.size); |
memcpy(out, ud.data, ud.size); |
out[utf8data.size] = '\0'; |
out[ud.size] = '\0'; |
return (out); |
return (out); |
} |
} |
} |
} |