diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-01-08 12:13:57 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2016-02-26 13:07:58 +0000 |
| commit | c4fea64f90ee7078caba4b8080928e5d11f33b4a (patch) | |
| tree | 4dcea0ac7f82bc31a117c7acd20562b68cfb2c71 | |
| parent | ef8b2730a9021e7730c2c713f886527dc1848ebe (diff) | |
| download | genivi-demo-platform-hmi-c4fea64f90ee7078caba4b8080928e5d11f33b4a.tar.gz | |
Fix ilm_UpdateInputEventAcceptanceOn
| -rw-r--r-- | src/gdp-hmi-controller.cpp | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/src/gdp-hmi-controller.cpp b/src/gdp-hmi-controller.cpp index 0d42c13..bb7307c 100644 --- a/src/gdp-hmi-controller.cpp +++ b/src/gdp-hmi-controller.cpp @@ -332,6 +332,8 @@ static void launcher_show(const struct gdp_surface_context gdp_surface) ilmErrorTypes callResult = ILM_FAILED; t_ilm_surface surfaceIdArray[] = {GDP_LAUNCHER_SURFACE_ID}; t_ilm_layer layerIdArray[] = {GDP_LAUNCHER_LAYER_ID}; + t_ilm_string* seats; + t_ilm_uint seat_count; sd_journal_print(LOG_DEBUG, "launcher_show" "(surface = %u, layer = %u)\n", @@ -347,12 +349,11 @@ static void launcher_show(const struct gdp_surface_context gdp_surface) gdp_surface.id_surface, 1.0f); callResult = ilm_commitChanges(); sd_journal_print(LOG_DEBUG, "launcher_show - input focus on\n"); - callResult = ilm_UpdateInputEventAcceptanceOn( - gdp_surface.id_surface, - ILM_INPUT_DEVICE_POINTER | - ILM_INPUT_DEVICE_TOUCH | - ILM_INPUT_DEVICE_KEYBOARD, - ILM_TRUE); + ilm_getInputDevices(ILM_INPUT_DEVICE_POINTER | + ILM_INPUT_DEVICE_TOUCH | + ILM_INPUT_DEVICE_KEYBOARD, + &seat_count, &seats); + callResult = ilm_setInputAcceptanceOn(gdp_surface.id_surface, seat_count, seats); callResult = ilm_setInputFocus(surfaceIdArray, 1, IVI_CONTROLLER_SURFACE_INPUT_DEVICE_KEYBOARD, ILM_TRUE); callResult = ilm_commitChanges(); @@ -401,6 +402,8 @@ void surface_control(const int index) t_ilm_surface surfaceIdArray[] = {GDP_BACKGROUND_SURFACE_ID}; t_ilm_layer layerIdArray[] = {GDP_BACKGROUND_LAYER_ID, GDP_PANEL_LAYER_ID}; + t_ilm_string* seats; + t_ilm_uint seat_count; sd_journal_print(LOG_DEBUG, "surface_control - index = %d" "(surface = %u, layer = %u)\n", @@ -409,6 +412,7 @@ void surface_control(const int index) surfaceIdArray[0] = gdp_surface.id_surface; layerIdArray[0] = gdp_surface.id_layer; + switch(gdp_surface.id_surface) { case GDP_PANEL_SURFACE_ID: // Panel callResult = ilm_surfaceSetDestinationRectangle( @@ -419,12 +423,11 @@ void surface_control(const int index) gdp_surface.id_surface, 1.0f); callResult = ilm_commitChanges(); sd_journal_print(LOG_DEBUG, "surface_control (0) - input focus on\n"); - callResult = ilm_UpdateInputEventAcceptanceOn( - gdp_surface.id_surface, - ILM_INPUT_DEVICE_POINTER | - ILM_INPUT_DEVICE_TOUCH | - ILM_INPUT_DEVICE_KEYBOARD, - ILM_TRUE); + ilm_getInputDevices(ILM_INPUT_DEVICE_POINTER | + ILM_INPUT_DEVICE_TOUCH | + ILM_INPUT_DEVICE_KEYBOARD, + &seat_count, &seats); + callResult = ilm_setInputAcceptanceOn(gdp_surface.id_surface, seat_count, seats); 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"); @@ -461,12 +464,11 @@ void surface_control(const int index) gdp_surface.id_surface, 1.0f); callResult = ilm_commitChanges(); sd_journal_print(LOG_DEBUG, "surface_control - input focus on\n"); - callResult = ilm_UpdateInputEventAcceptanceOn( - gdp_surface.id_surface, - ILM_INPUT_DEVICE_POINTER | - ILM_INPUT_DEVICE_TOUCH | - ILM_INPUT_DEVICE_KEYBOARD, - ILM_TRUE); + ilm_getInputDevices(ILM_INPUT_DEVICE_POINTER | + ILM_INPUT_DEVICE_TOUCH | + ILM_INPUT_DEVICE_KEYBOARD, + &seat_count, &seats); + callResult = ilm_setInputAcceptanceOn(gdp_surface.id_surface, seat_count, seats); callResult = ilm_setInputFocus(surfaceIdArray, 1, IVI_CONTROLLER_SURFACE_INPUT_DEVICE_KEYBOARD, ILM_TRUE); callResult = ilm_commitChanges(); |