diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-01-07 14:41:24 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2016-02-26 13:07:31 +0000 |
| commit | ef8b2730a9021e7730c2c713f886527dc1848ebe (patch) | |
| tree | 2f13683deaeb5da08d3b8ffd07d05c676918e8ba | |
| parent | c8ce960bd2862b58d394d02b1d49f1d097665adf (diff) | |
| download | genivi-demo-platform-hmi-ef8b2730a9021e7730c2c713f886527dc1848ebe.tar.gz | |
Change to setInputFocus
This includes fixing the libraries to link against libilmInput
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | src/gdp-hmi-controller.cpp | 8 |
2 files changed, 10 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index f0c7ba2..c3801b3 100644 --- a/configure.ac +++ b/configure.ac @@ -59,12 +59,11 @@ PKG_CHECK_MODULES([CLIENT], [ # Check for wayland-ivi-extension AC_CHECK_HEADERS([ilm/ilm_types.h]) -AC_CHECK_LIB(ilmClient, ilm_UpdateInputEventAcceptanceOn, - [ILM_LIBS="-lilmCommon -lilmClient"], - [AC_MSG_ERROR([Can't find correct ilmClient library.])]) -AC_CHECK_LIB(ilmControl, ilm_SetKeyboardFocusOn, - [ILM_LIBS="$ILM_LIBS -lilmControl"], - [AC_MSG_ERROR([Can't find correct ilmControl library.])]) +AC_CHECK_LIB(ilmInput, ilm_setInputAcceptanceOn, [], + [AC_MSG_ERROR([Can't find correct ilmInput library.])]) +AC_CHECK_LIB(ilmInput, ilm_setInputFocus, [], + [AC_MSG_ERROR([Can't find correct ilmInput library.])]) +ILM_LIBS="-lilmCommon -lilmControl -lilmInput" AC_SUBST(ILM_LIBS) WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client` diff --git a/src/gdp-hmi-controller.cpp b/src/gdp-hmi-controller.cpp index 63afa7d..0d42c13 100644 --- a/src/gdp-hmi-controller.cpp +++ b/src/gdp-hmi-controller.cpp @@ -43,6 +43,7 @@ #include <ilm/ilm_types.h> #include <ilm/ilm_client.h> #include <ilm/ilm_control.h> +#include <ilm/ilm_input.h> #include "wayland-util.h" #include "ivi-controller-client-protocol.h" @@ -352,7 +353,7 @@ static void launcher_show(const struct gdp_surface_context gdp_surface) ILM_INPUT_DEVICE_TOUCH | ILM_INPUT_DEVICE_KEYBOARD, ILM_TRUE); - callResult = ilm_SetKeyboardFocusOn(gdp_surface.id_surface); + callResult = ilm_setInputFocus(surfaceIdArray, 1, IVI_CONTROLLER_SURFACE_INPUT_DEVICE_KEYBOARD, ILM_TRUE); callResult = ilm_commitChanges(); sd_journal_print(LOG_DEBUG, "launcher_show - render order - layer\n"); @@ -424,7 +425,7 @@ void surface_control(const int index) ILM_INPUT_DEVICE_TOUCH | ILM_INPUT_DEVICE_KEYBOARD, ILM_TRUE); - callResult = ilm_SetKeyboardFocusOn(gdp_surface.id_surface); + callResult = ilm_setInputFocus(surfaceIdArray, 1, IVI_CONTROLLER_SURFACE_INPUT_DEVICE_KEYBOARD, ILM_TRUE); callResult = ilm_commitChanges(); sd_journal_print(LOG_DEBUG, "surface_control - render order - layer\n"); callResult = ilm_layerSetDestinationRectangle(gdp_surface.id_layer, @@ -466,7 +467,8 @@ void surface_control(const int index) ILM_INPUT_DEVICE_TOUCH | ILM_INPUT_DEVICE_KEYBOARD, ILM_TRUE); - callResult = ilm_SetKeyboardFocusOn(gdp_surface.id_surface); + + callResult = ilm_setInputFocus(surfaceIdArray, 1, IVI_CONTROLLER_SURFACE_INPUT_DEVICE_KEYBOARD, ILM_TRUE); callResult = ilm_commitChanges(); sd_journal_print(LOG_DEBUG, "surface_control - render order - layer\n"); |