Protocol, ilmControl, add weston-ivi-shell: Add device type to argument of input_focu...

A parameter, device, is missing from protocol. It is needed for API spec.

Signed-off-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@denso.co.jp>

diff --git a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
index e47ee2c..037e170 100644 (file)
--- a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
+++ b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
@@ -757,10 +757,12 @@ controller_surface_listener_content(void *data,
 static void
 controller_surface_listener_input_focus(void *data,
                    struct ivi_controller_surface *controller,
+                   uint32_t device,
                    int32_t enabled)
 {
     (void)data;
     (void)controller;
+    (void)device;
     (void)enabled;
 }
 

diff --git a/protocol/ivi-controller.xml b/protocol/ivi-controller.xml
index d8a0211..7dfe4fa 100644 (file)
--- a/protocol/ivi-controller.xml
+++ b/protocol/ivi-controller.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.2" encoding="UTF-8"?>
 <protocol name="ivi_controller">
 
     <copyright>
@@ -270,6 +270,7 @@
                 surface will have input focus.
                 If argument enabled is not 0, input focus for this surface is enabled.
             </description>
+            <arg name="device" type="uint"/>
             <arg name="enabled" type="int"/>
         </request>
 
@@ -279,9 +280,19 @@
                 this surface has no longer the input focus. If enbaled is not 0, this surface
                 now has input focus enabled.
             </description>
+            <arg name="device" type="uint"/>
             <arg name="enabled" type="int"/>
         </event>
 
+        <enum name="input_device">
+            <description summary="brief Identifier of different input device types. Can be used as a bitmask.">
+            </description>
+            <entry name="keyboard" value="0x1"/>
+            <entry name="pointer" value="0x2"/>
+            <entry name="touch" value="0x4"/>
+            <entry name="all" value="~0x0"/>
+        </enum>
+
     </interface>
 
     <interface name="ivi_controller_layer" version="1">

diff --git a/weston-ivi-shell/src/ivi-controller.c b/weston-ivi-shell/src/ivi-controller.c
index 3adbe01..40c01f7 100755 (executable)
--- a/weston-ivi-shell/src/ivi-controller.c
+++ b/weston-ivi-shell/src/ivi-controller.c
@@ -809,10 +809,12 @@ controller_surface_destroy(struct wl_client *client,
 static void
 controller_surface_set_input_focus(struct wl_client *client,
               struct wl_resource *resource,
+              uint32_t device,
               int32_t enabled)
 {
     (void)client;
     (void)resource;
+    (void)device;
     (void)enabled;
 }