From d8be0b103bab9c14abf64f415c14f981e3ba6098 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Tue, 10 Jul 2018 14:44:36 -0400 Subject: [PATCH] ecore_wl2&elput: correctly fill the key structure Summary: the key structure has two fields key and keyname, those should be identical to the keystructures from x. the method xkb_keysym_to_utf8 however returns different values for keys like "minus" thus only relying on xkb_keysym_name files this issue. Reviewers: eagleeye, devilhorns Reviewed By: eagleeye Subscribers: cedric, #committers, zmike Tags: #efl Differential Revision: https://phab.enlightenment.org/D6520 --- src/lib/ecore_wl2/ecore_wl2_input.c | 10 ---------- src/lib/elput/elput_evdev.c | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_input.c b/src/lib/ecore_wl2/ecore_wl2_input.c index fa064f1..25fe712 100644 --- a/src/lib/ecore_wl2/ecore_wl2_input.c +++ b/src/lib/ecore_wl2/ecore_wl2_input.c @@ -906,16 +906,6 @@ in this Software without prior written authorization from The Open Group. static void _ecore_wl2_input_symbol_rep_find(xkb_keysym_t keysym, char *buffer, int size, unsigned int code) { - int n = 0; - - n = xkb_keysym_to_utf8(keysym, buffer, size); - - /* check if we are a control code */ - if (n > 0 && !( - (buffer[0] > 0x0 && buffer[0] <= 0x20) || /* others 0x0 to 0x20 control codes */ - buffer[0] == 0x7F)) /*delete control code */ - return; - if (xkb_keysym_get_name(keysym, buffer, size) != 0) return; diff --git a/src/lib/elput/elput_evdev.c b/src/lib/elput/elput_evdev.c index 91bbbb2..635061a 100644 --- a/src/lib/elput/elput_evdev.c +++ b/src/lib/elput/elput_evdev.c @@ -606,16 +606,6 @@ process_key_press(xkb_keysym_t sym, Elput_Keyboard *kbd) static void _elput_symbol_rep_find(xkb_keysym_t keysym, char *buffer, int size, unsigned int code) { - int n = 0; - - n = xkb_keysym_to_utf8(keysym, buffer, size); - - /* check if we are a control code */ - if (n > 0 && !( - (buffer[0] > 0x0 && buffer[0] < 0x20) || /* others 0x0 to 0x1F control codes */ - buffer[0] == 0x7F)) /*delete control code */ - return; - if (xkb_keysym_get_name(keysym, buffer, size) != 0) return; -- 2.7.4