From 49e2834feaba9d5e9cfb7a8e3b28c534ef9f44de Mon Sep 17 00:00:00 2001 From: MinJeong Kim Date: Wed, 3 Jun 2015 16:17:52 +0900 Subject: [PATCH] wl_drm: enable pointer when touch device is added Change-Id: I6d6eec7a5f30706f1ad5a264a9786543ce9323d7 Signed-off-by: MinJeong Kim --- src/modules/wl_drm/e_mod_main.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c index 5f59a29..c918bf4 100644 --- a/src/modules/wl_drm/e_mod_main.c +++ b/src/modules/wl_drm/e_mod_main.c @@ -85,6 +85,15 @@ _e_mod_drm_cb_input_device_add(void *data, int type, void *event) e_pointer_object_set(comp->pointer, NULL, 0, 0); e_comp_wl_input_pointer_enabled_set(EINA_TRUE); } + else if (e->caps & EVDEV_SEAT_KEYBOARD) + { + e_comp_wl_input_keyboard_enabled_set(EINA_TRUE); + } + else if (e->caps & EVDEV_SEAT_TOUCH) + { + e_comp_wl_input_pointer_enabled_set(EINA_TRUE); + e_comp_wl_input_touch_enabled_set(EINA_TRUE); + } end: return ECORE_CALLBACK_PASS_ON; @@ -215,9 +224,6 @@ e_modapi_init(E_Module *m) /* NB: This needs to be called AFTER the comp canvas has been setup */ if (!e_comp_wl_init()) return NULL; - e_comp_wl_input_keyboard_enabled_set(EINA_TRUE); - e_comp_wl_input_touch_enabled_set(EINA_TRUE); - /* comp->pointer = */ /* e_pointer_window_new(ecore_evas_window_get(comp->ee), 1); */ comp->pointer = e_pointer_canvas_new(comp->ee, EINA_TRUE); -- 2.7.4