ilmControl: Remove ilm_Set/GetKeyboardFocusOn/SurfaceId

i.e. Removes the functions ilm_SetKeyboardFocusOn and
ilm_GetKeyboardFocusSurfaceId, along with the parts of
wayland-ivi-extension that support it.

This functionality has been removed, in preparation for a new, more
general input focus API.

Signed-off-by: James Thomas <james.thomas@codethink.co.uk>

5 files changed, 2 insertions, 62 deletions

diff --git a/ivi-layermanagement-examples/EGLWLInputEventExample/src/WLSurface.cpp b/ivi-layermanagement-examples/EGLWLInputEventExample/src/WLSurface.cpp
index 2a0572e..47d1311 100644
--- a/ivi-layermanagement-examples/EGLWLInputEventExample/src/WLSurface.cpp
+++ b/ivi-layermanagement-examples/EGLWLInputEventExample/src/WLSurface.cpp
@@ -85,7 +85,7 @@ WLSurface::CreateIlmSurface(t_ilm_surface* surfaceId,
     rtnv = ilm_surfaceSetOpacity(*surfaceId, 1.0f);
 
     /* TODO: Set input acceptance using new API */
-    rtnv = ilm_SetKeyboardFocusOn(*surfaceId);
+    /* TODO: Set keyboard focus using new API */
 
     rtnv = ilm_commitChanges();
 
@@ -99,7 +99,7 @@ WLSurface::DestroyIlmSurface()
 {
     if (m_ilmSurfaceId > 0){
         /* TODO: Set input acceptance using new API */
-        ilm_SetKeyboardFocusOn(m_ilmSurfaceId);
+	/* TODO: Set input focus using the new API */
         ilm_commitChanges();
         ilm_surfaceRemove(m_ilmSurfaceId);
     }
diff --git a/ivi-layermanagement-examples/LayerManagerControl/include/LMControl.h b/ivi-layermanagement-examples/LayerManagerControl/include/LMControl.h
index ce0b974..d17f99f 100644
--- a/ivi-layermanagement-examples/LayerManagerControl/include/LMControl.h
+++ b/ivi-layermanagement-examples/LayerManagerControl/include/LMControl.h
@@ -251,8 +251,6 @@ void printScene();
 //control.cpp
 //=============================================================================
 void getCommunicatorPerformance();
-void setSurfaceKeyboardFocus(t_ilm_surface surface);
-void getKeyboardFocus();
 void testNotificationLayer(t_ilm_layer layerid);
 void watchLayer(unsigned int* layerids, unsigned int layeridCount);
 void watchSurface(unsigned int* surfaceids, unsigned int surfaceidCount);
diff --git a/ivi-layermanagement-examples/LayerManagerControl/src/commands.cpp b/ivi-layermanagement-examples/LayerManagerControl/src/commands.cpp
index 641b1ea..40a67cd 100644
--- a/ivi-layermanagement-examples/LayerManagerControl/src/commands.cpp
+++ b/ivi-layermanagement-examples/LayerManagerControl/src/commands.cpp
@@ -651,23 +651,6 @@ COMMAND("get communicator performance")
 }
 
 //=============================================================================
-COMMAND("set surface <surfaceid> keyboard focus")
-//=============================================================================
-{
-    t_ilm_surface surface = input->getUint("surfaceid");
-
-    setSurfaceKeyboardFocus(surface);
-}
-
-//=============================================================================
-COMMAND("get keyboard focus")
-//=============================================================================
-{
-    (void) input; //suppress warning: unused parameter
-    getKeyboardFocus();
-}
-
-//=============================================================================
 COMMAND("test notification layer <layerid>")
 //=============================================================================
 {
diff --git a/ivi-layermanagement-examples/LayerManagerControl/src/control.cpp b/ivi-layermanagement-examples/LayerManagerControl/src/control.cpp
index 48ae5f6..44e0931 100644
--- a/ivi-layermanagement-examples/LayerManagerControl/src/control.cpp
+++ b/ivi-layermanagement-examples/LayerManagerControl/src/control.cpp
@@ -83,34 +83,6 @@ void getCommunicatorPerformance()
     cout << (runs / runtimeInSec) << " transactions/second\n";
 }
 
-void setSurfaceKeyboardFocus(t_ilm_surface surface)
-{
-    ilmErrorTypes callResult = ilm_SetKeyboardFocusOn(surface);
-    if (ILM_SUCCESS != callResult)
-    {
-        cout << "LayerManagerService returned: " << ILM_ERROR_STRING(callResult) << "\n";
-        cout << "Failed to set keyboard focus at surface with ID " << surface << "\n";
-        return;
-    }
-}
-
-void getKeyboardFocus()
-{
-    t_ilm_surface surfaceId;
-
-    ilmErrorTypes callResult = ilm_GetKeyboardFocusSurfaceId(&surfaceId);
-    if (ILM_SUCCESS == callResult)
-    {
-        cout << "keyboardFocusSurfaceId == " << surfaceId << endl;
-    }
-    else
-    {
-        cout << "LayerManagerService returned: " << ILM_ERROR_STRING(callResult) << "\n";
-        cout << "Failed to get keyboard focus surface ID\n";
-        return;
-    }
-}
-
 void layerNotificationCallback(t_ilm_layer layer, struct ilmLayerProperties* properties, t_ilm_notification_mask mask)
 {
     cout << "\nNotification: layer " << layer << " updated properties:\n";
diff --git a/ivi-layermanagement-examples/LayerManagerControl/src/print.cpp b/ivi-layermanagement-examples/LayerManagerControl/src/print.cpp
index b5b8451..8cfc4c4 100644
--- a/ivi-layermanagement-examples/LayerManagerControl/src/print.cpp
+++ b/ivi-layermanagement-examples/LayerManagerControl/src/print.cpp
@@ -317,19 +317,6 @@ void printSurfaceProperties(unsigned int surfaceid, const char* prefix)
 
     cout << prefix << "- native surface:     " << p.nativeSurface << "\n";
 
-    t_ilm_surface keyboardFocusSurfaceId;
-    callResult = ilm_GetKeyboardFocusSurfaceId(&keyboardFocusSurfaceId);
-    if (ILM_SUCCESS != callResult)
-    {
-        cout << "LayerManagerService returned: " << ILM_ERROR_STRING(callResult) << "\n";
-        cout << "Failed to get keyboard focus surface ID\n";
-        return;
-    }
-
-    cout << prefix << "- has keyboard focus: "
-            << (keyboardFocusSurfaceId == surfaceid ? "true" : "false")
-            << "\n";
-
     cout << prefix << "- counters:           frame=" << p.frameCounter
             << ", draw=" << p.drawCounter << ", update=" << p.updateCounter
             << "\n";