devilhorns pushed a commit to branch master.
commit 32b1e742c795c86c7e267ab34867200f341c2c98
Author: Chris Michael <[email protected]>
Date: Wed Aug 21 14:40:58 2013 +0100
Revert "Remove call to ecore_x function for getting keycode."
This reverts commit ccb72c38ca3197519094ad3fbd4510cd1609cde1.
Revert this (for now) because it breaks key input for wayland apps running
inside of X. Need more time to look into it....
---
src/modules/wl_desktop_shell/e_mod_main.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/modules/wl_desktop_shell/e_mod_main.c
b/src/modules/wl_desktop_shell/e_mod_main.c
index d41a4d5..85fa1cc 100644
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -1438,7 +1438,7 @@ _e_wl_shell_shell_surface_cb_key_down(void *data,
Evas_Object *obj EINA_UNUSED,
struct wl_keyboard_grab *grab;
unsigned int serial = 0, key = 0;
unsigned int *end, *k;
- xkb_keysym_t sym = XKB_KEY_NoSymbol;
+
ev = event;
/* try to cast data to our surface structure */
@@ -1459,11 +1459,7 @@ _e_wl_shell_shell_surface_cb_key_down(void *data,
Evas_Object *obj EINA_UNUSED,
if (_e_wl_comp->ping_cb) _e_wl_comp->ping_cb(ews, serial);
/* get the keycode for this key from X */
- sym = xkb_keysym_from_name(ev->keyname, 0);
- if (!sym)
- sym = xkb_keysym_from_name(ev->keyname, XKB_KEYSYM_CASE_INSENSITIVE);
-
- key = sym - 8;
+ key = ecore_x_keysym_keycode_get(ev->keyname) - 8;
/* update the keyboards grab properties */
kbd->grab_key = key;
--
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
