From 9e1ba64c08399f7c58ee963472fa9cffe8122dfa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Ekstr=C3=B6m?= Date: Tue, 2 Dec 2014 10:37:07 +0200 Subject: [PATCH] downstream: use ifdef SUPPORT_INPUT_FOCUS for keyboard focus functions. Change-Id: I109bc54490bc1fbd395cdac9ca25a620f5f0a7c2 --- weston-ivi-shell/src/ivi-controller.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/weston-ivi-shell/src/ivi-controller.c b/weston-ivi-shell/src/ivi-controller.c index 088f640..861b460 100755 --- a/weston-ivi-shell/src/ivi-controller.c +++ b/weston-ivi-shell/src/ivi-controller.c @@ -1114,6 +1114,7 @@ controller_surface_set_input_focus(struct wl_client *client, uint32_t device, int32_t enabled) { +#ifdef SUPPORT_INPUT_FOCUS (void)client; struct ivisurface *ivisurf = wl_resource_get_user_data(resource); @@ -1124,6 +1125,7 @@ controller_surface_set_input_focus(struct wl_client *client, send_all_keyboard_focus(ivisurf->shell); } } +#endif } static const @@ -1657,9 +1659,11 @@ controller_set_keyboard_focus(struct wl_client *client, struct wl_resource *resource, struct wl_array *surfaces) { +#ifdef SUPPORT_INPUT_FOCUS struct ivicontroller *ctrl = wl_resource_get_user_data(resource); ivi_layout_set_keyboard_focus_on(surfaces->data, surfaces->size); send_all_keyboard_focus(ctrl->shell); +#endif } static const struct ivi_controller_interface controller_implementation = { -- 2.7.4