From 359ca5464cfa4588f431565ee4744136c5504eaf Mon Sep 17 00:00:00 2001 From: Victor Cebollada Date: Fri, 16 Dec 2016 11:13:17 +0000 Subject: [PATCH] Ecore Event Handler struct initializations. * Wayland and x11 implementations need some initializations. Change-Id: I73368dda8b37205322c128877e5b3d7c60fc8a96 Signed-off-by: Victor Cebollada --- adaptors/ecore/wayland/event-handler-ecore-wl.cpp | 5 +++++ adaptors/x11/ecore-x-event-handler.cpp | 2 ++ 2 files changed, 7 insertions(+) diff --git a/adaptors/ecore/wayland/event-handler-ecore-wl.cpp b/adaptors/ecore/wayland/event-handler-ecore-wl.cpp index 1b3012d..6c40cd2 100644 --- a/adaptors/ecore/wayland/event-handler-ecore-wl.cpp +++ b/adaptors/ecore/wayland/event-handler-ecore-wl.cpp @@ -495,6 +495,11 @@ struct EventHandler::Impl ecoreKeyDownEvent.timestamp = keyEvent->timestamp; ecoreKeyDownEvent.modifiers = EcoreInputModifierToEcoreIMFModifier ( keyEvent->modifiers ); ecoreKeyDownEvent.locks = (Ecore_IMF_Keyboard_Locks) ECORE_IMF_KEYBOARD_LOCK_NONE; +#ifdef ECORE_IMF_1_13 + ecoreKeyDownEvent.dev_name = ""; + ecoreKeyDownEvent.dev_class = ECORE_IMF_DEVICE_CLASS_KEYBOARD; + ecoreKeyDownEvent.dev_subclass = ECORE_IMF_DEVICE_SUBCLASS_NONE; +#endif // ECORE_IMF_1_13 eventHandled = ecore_imf_context_filter_event( imfContext, ECORE_IMF_EVENT_KEY_DOWN, diff --git a/adaptors/x11/ecore-x-event-handler.cpp b/adaptors/x11/ecore-x-event-handler.cpp index a611d8e..38c64ac 100644 --- a/adaptors/x11/ecore-x-event-handler.cpp +++ b/adaptors/x11/ecore-x-event-handler.cpp @@ -669,6 +669,8 @@ struct EventHandler::Impl ecoreKeyDownEvent.locks = (Ecore_IMF_Keyboard_Locks) ECORE_IMF_KEYBOARD_LOCK_NONE; #ifdef ECORE_IMF_1_13 ecoreKeyDownEvent.dev_name = ""; + ecoreKeyDownEvent.dev_class = ECORE_IMF_DEVICE_CLASS_KEYBOARD; + ecoreKeyDownEvent.dev_subclass = ECORE_IMF_DEVICE_SUBCLASS_NONE; #endif // ECORE_IMF_1_13 eventHandled = ecore_imf_context_filter_event( imfContext, -- 2.7.4