Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

ime: fix typing the EURO symbol using the on-screen keyboard

Browse source
This commit is contained in:
Sam Lantinga 2022-04-27 10:03:28 -07:00 committed by GitHub
parent 1b54be4aca
commit d4bdeb71e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/ime.cpp
View file

@ -118,13 +118,22 @@ static LogScope ime_log("ime");
static struct wlserver_input_method *active_input_method = nullptr; static struct wlserver_input_method *active_input_method = nullptr;
static xkb_keysym_t keysym_from_ch(uint32_t ch)
{
// There's a bug in libxkbcommon where the EURO symbol doesn't map to the correct keysym
if (ch == 0x20ac) {
return XKB_KEY_EuroSign;
}
return xkb_utf32_to_keysym(ch);
}
static uint32_t keycode_from_ch(struct wlserver_input_method *ime, uint32_t ch) static uint32_t keycode_from_ch(struct wlserver_input_method *ime, uint32_t ch)
{ {
if (ime->keys.count(ch) > 0) { if (ime->keys.count(ch) > 0) {
return ime->keys[ch].keycode; return ime->keys[ch].keycode;
} }
xkb_keysym_t keysym = xkb_utf32_to_keysym(ch); xkb_keysym_t keysym = keysym_from_ch(ch);
if (keysym == XKB_KEY_NoSymbol) { if (keysym == XKB_KEY_NoSymbol) {
return XKB_KEYCODE_INVALID; return XKB_KEYCODE_INVALID;
} }
@ -286,7 +295,7 @@ static void type_text(struct wlserver_input_method *ime, const char *text)
{ {
// If possible, try to type the character without switching the keymap // If possible, try to type the character without switching the keymap
if (utf8_size(text) == 1 && text[1] == '\0') { if (utf8_size(text) == 1 && text[1] == '\0') {
xkb_keysym_t keysym = xkb_utf32_to_keysym(text[0]); xkb_keysym_t keysym = keysym_from_ch(text[0]);
if (keysym != XKB_KEY_NoSymbol && try_type_keysym(ime, keysym)) { if (keysym != XKB_KEY_NoSymbol && try_type_keysym(ime, keysym)) {
return; return;
} }