From 595b38cb730ad0f71576b163fd87c4da4bb48304 Mon Sep 17 00:00:00 2001 From: JeongHyun Kang Date: Fri, 10 Jun 2016 17:32:08 +0900 Subject: [PATCH] Remove HAVE_WL_DRM definition check in input system Change-Id: I431bdf822a6b4a7ee8ab2b0bfe7230a2517e9318 --- src/bin/e_comp_wl_input.c | 6 ------ src/bin/e_mouse.c | 4 ---- 2 files changed, 10 deletions(-) diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c index 45c5dee..6e7d602 100644 --- a/src/bin/e_comp_wl_input.c +++ b/src/bin/e_comp_wl_input.c @@ -1,9 +1,7 @@ #define EXECUTIVE_MODE_ENABLED #include "e.h" #include -#ifdef HAVE_WL_DRM #include -#endif E_API int E_EVENT_TEXT_INPUT_PANEL_VISIBILITY_CHANGE = -1; static Eina_Bool dont_set_ecore_drm_keymap = EINA_FALSE; @@ -823,10 +821,8 @@ e_comp_wl_input_keymap_set(const char *rules, const char *model, const char *lay return; } -#ifdef HAVE_WL_DRM if (e_config->xkb.use_cache && !dont_set_ecore_drm_keymap) ecore_drm_device_keyboard_cached_context_set(e_comp_wl->xkb.context); -#endif /* assemble xkb_rule_names so we can fetch keymap */ memset(&names, 0, sizeof(names)); @@ -879,10 +875,8 @@ e_comp_wl_input_keymap_set(const char *rules, const char *model, const char *lay /* update compositor keymap */ _e_comp_wl_input_keymap_update(keymap, keymap_path); -#ifdef HAVE_WL_DRM if (e_config->xkb.use_cache && !dont_set_ecore_drm_keymap) ecore_drm_device_keyboard_cached_keymap_set(keymap); -#endif /* cleanup */ if (keymap_path) eina_stringshare_del(keymap_path); diff --git a/src/bin/e_mouse.c b/src/bin/e_mouse.c index fde3535..1a21986 100644 --- a/src/bin/e_mouse.c +++ b/src/bin/e_mouse.c @@ -1,12 +1,9 @@ #include "e.h" -#ifdef HAVE_WL_DRM #include -#endif E_API int e_mouse_update(void) { -#ifdef HAVE_WL_DRM if (strstr(ecore_evas_engine_name_get(e_comp->ee), "drm")) { const Eina_List *list, *l; @@ -18,6 +15,5 @@ e_mouse_update(void) ecore_drm_device_pointer_left_handed_set(dev, (Eina_Bool)!e_config->mouse_hand); } } -#endif return 1; } -- 2.7.4