This patch is for master branch only.
For using wayland-ivi-extension version 2.x,
the wayland protocol in WindowManager is changed
from ivi-controller to ivi-wm.
NOTE:
If using this patch,
the modification for AGL/meta-agl
which described in SPEC-1244 is necessary.
Bug-AGL: SPEC-1244
Change-Id: I5489db202dfeec8f4626aee53bd1f86c145b95d9
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
},
"mappings": [
+ {
+ "role": "BackGroundLayer",
+ "name": "BackGroundLayer",
+ "layer_id": 999,
+ "area": { "type": "rect", "rect": { "x": 0, "y": 218, "width": -1, "height": -433 } },
+ "comment": "Single BackGround layer map for the Navigation, Radio and MediaPlayer"
+ },
{
"role": "^HomeScreen$",
"name": "HomeScreen",
"comment": "Single layer map for the HomeScreen"
},
{
- "role": "MediaPlayer|Radio|Phone|Navigation|HVAC|Settings|Dashboard|POI|Mixer",
+ "role": "Music|Video|WebBrowser|MediaPlayer|Radio|Phone|Navigation|HVAC|Settings|Dashboard|POI|Mixer",
"name": "apps",
"layer_id": 1001,
"area": { "type": "rect", "rect": { "x": 0, "y": 218, "width": -1, "height": -433 } },
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="ivi_application">
-
- <copyright>
- Copyright (C) 2013 DENSO CORPORATION
- Copyright (c) 2013 BMW Car IT GmbH
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice (including the next
- paragraph) shall be included in all copies or substantial portions of the
- Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
- </copyright>
-
- <interface name="ivi_surface" version="1">
- <description summary="application interface to surface in ivi compositor"/>
-
- <request name="destroy" type="destructor">
- <description summary="destroy ivi_surface">
- This removes link from ivi_id to wl_surface and destroys ivi_surface.
- The ID, ivi_id, is free and can be used for surface_create again.
- </description>
- </request>
-
- <event name="configure">
- <description summary="suggest resize">
- The configure event asks the client to resize its surface.
-
- The size is a hint, in the sense that the client is free to
- ignore it if it doesn't resize, pick a smaller size (to
- satisfy aspect ratio or resize in steps of NxM pixels).
-
- The client is free to dismiss all but the last configure
- event it received.
-
- The width and height arguments specify the size of the window
- in surface local coordinates.
- </description>
- <arg name="width" type="int"/>
- <arg name="height" type="int"/>
- </event>
- </interface>
-
- <interface name="ivi_application" version="1">
- <description summary="create ivi-style surfaces">
- This interface is exposed as a global singleton.
- This interface is implemented by servers that provide IVI-style user interfaces.
- It allows clients to associate a ivi_surface with wl_surface.
- </description>
-
- <enum name="error">
- <entry name="role" value="0" summary="given wl_surface has another role"/>
- <entry name="ivi_id" value="1" summary="given ivi_id is assigned to another wl_surface"/>
- </enum>
-
- <request name="surface_create">
- <description summary="create ivi_surface with numeric ID in ivi compositor">
- This request gives the wl_surface the role of an IVI Surface. Creating more than
- one ivi_surface for a wl_surface is not allowed. Note, that this still allows the
- following example:
-
- 1. create a wl_surface
- 2. create ivi_surface for the wl_surface
- 3. destroy the ivi_surface
- 4. create ivi_surface for the wl_surface (with the same or another ivi_id as before)
-
- surface_create will create a interface:ivi_surface with numeric ID; ivi_id in
- ivi compositor. These ivi_ids are defined as unique in the system to identify
- it inside of ivi compositor. The ivi compositor implements business logic how to
- set properties of the surface with ivi_id according to status of the system.
- E.g. a unique ID for Car Navigation application is used for implementing special
- logic of the application about where it shall be located.
- The server regards following cases as protocol errors and disconnects the client.
- - wl_surface already has an nother role.
- - ivi_id is already assigned to an another wl_surface.
-
- If client destroys ivi_surface or wl_surface which is assigne to the ivi_surface,
- ivi_id which is assigned to the ivi_surface is free for reuse.
- </description>
- <arg name="ivi_id" type="uint"/>
- <arg name="surface" type="object" interface="wl_surface"/>
- <arg name="id" type="new_id" interface="ivi_surface"/>
- </request>
-
- </interface>
-
-</protocol>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="ivi_controller">
-
- <copyright>
- Copyright (C) 2013 DENSO CORPORATION
- Copyright (c) 2013 BMW Car IT GmbH
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- </copyright>
-
- <interface name="ivi_controller_surface" version="1">
- <description summary="controller interface to surface in ivi compositor"/>
-
- <request name="set_visibility">
- <description summary="set the visibility of a surface in ivi compositor">
- If visibility argument is 0, the surface in the ivi compositor is set to invisible.
- If visibility argument is not 0, the surface in the ivi compositor is set to visible.
- </description>
- <arg name="visibility" type="uint"/>
- </request>
-
- <request name="set_opacity">
- <description summary="set the opacity of a surface in ivi compositor">
- The valid range for opacity is 0.0 (fully transparent) to 1.0 (fully opaque).
- </description>
- <arg name="opacity" type="fixed"/>
- </request>
-
- <request name="set_source_rectangle">
- <description summary="set the scanout area of a surface in ivi compositor">
- The source rectangle defines the part of the surface content, that is used for
- compositing the surface. It can be used, if valid content of the surface is smaller
- than the surface. Effectively it can be used to zoom the content of the surface.
- x: horizontal start position of scanout area within the surface
- y: vertical start position of scanout area within the surface
- width: width of scanout area within the surface
- height: height of scanout area within the surface
- </description>
- <arg name="x" type="int"/>
- <arg name="y" type="int"/>
- <arg name="width" type="int"/>
- <arg name="height" type="int"/>
- </request>
-
- <request name="set_destination_rectangle">
- <description summary="Set the destination area of a surface within a layer">
- The destination rectangle defines the position and size of a surface on a layer.
- The surface will be scaled to this rectangle for rendering.
- x: horizontal start position of surface within the layer
- y: vertical start position of surface within the layer
- width : width of surface within the layer
- height: height of surface within the layer
- </description>
- <arg name="x" type="int"/>
- <arg name="y" type="int"/>
- <arg name="width" type="int"/>
- <arg name="height" type="int"/>
- </request>
-
- <request name="set_configuration">
- <description summary="request new buffer size for application content">
- Request the client providing content for this surface, to resize of the buffers
- provided as surface content.
- </description>
- <arg name="width" type="int"/>
- <arg name="height" type="int"/>
- </request>
-
- <request name="set_orientation">
- <description summary="set the orientation of a surface in ivi compositor">
- The orientation of a surface in ivi compositor can be rotated in 90 degree steps,
- as defined in orientation enum.
- </description>
- <arg name="orientation" type="int"/>
- </request>
-
- <request name="screenshot">
- <description summary="take screenshot of surface">
- Store a screenshot of the surface content in the file provided by argument filename.
- </description>
- <arg name="filename" type="string"/>
- </request>
-
- <event name="visibility">
- <description summary="the visibility of the surface in ivi compositor has changed">
- The new visibility state is provided in argument visibility.
- If visibility is 0, the surface has become invisible.
- If visibility is not 0, the surface has become visible.
- </description>
- <arg name="visibility" type="int"/>
- </event>
-
- <event name="opacity">
- <description summary="the opacity of surface in ivi compositor has changed">
- The new opacity state is provided in argument opacity.
- The valid range for opactiy is 0.0 (fully transparent) to 1.0 (fully opaque).
- </description>
- <arg name="opacity" type="fixed"/>
- </event>
-
- <event name="source_rectangle">
- <description summary="the source rectangle of surface in ivi compositor has changed">
- The scanout region of the surface content has changed.
- The new values for source rectangle are provided by
- x: new horizontal start position of scanout area within the surface
- y: new vertical start position of scanout area within the surface
- width: new width of scanout area within the surface
- height: new height of scanout area within the surface
- </description>
- <arg name="x" type="int"/>
- <arg name="y" type="int"/>
- <arg name="width" type="int"/>
- <arg name="height" type="int"/>
- </event>
-
- <event name="destination_rectangle">
- <description summary="the destination rectangle of surface in ivi compositor has changed">
- The new values for source rectangle are provided by
- x: new horizontal start position of surface within the layer
- y: new vertical start position of surface within the layer
- width : new width of surface within the layer
- height: new height of surface within the layer
- </description>
- <arg name="x" type="int"/>
- <arg name="y" type="int"/>
- <arg name="width" type="int"/>
- <arg name="height" type="int"/>
- </event>
-
- <event name="configuration">
- <description summary="the configuration of surface in ivi compositor has changed">
- The client providing content for this surface was requested to resize the buffer
- provided as surface content. The requested buffer size is provided by arguments
- width and height.
- </description>
- <arg name="width" type="int"/>
- <arg name="height" type="int"/>
- </event>
-
- <enum name="orientation">
- <description summary="orientation presets in degrees">
- The surfaces in ivi controller can be rotated in 90 degrees steps.
- This enum defines all valid orientations for surfaces.
- </description>
- <entry name="0_degrees" value="0" summary="not rotated"/>
- <entry name="90_degrees" value="1" summary="rotated 90 degrees clockwise"/>
- <entry name="180_degrees" value="2" summary="rotated 180 degrees clockwise"/>
- <entry name="270_degrees" value="3" summary="rotated 270 degrees clockwise"/>
- </enum>
-
- <event name="orientation">
- <description summary="the orientation of surface in ivi compositor has changed">
- The new orientation status is provided by argument orientation.
- </description>
- <arg name="orientation" type="int"/>
- </event>
-
- <enum name="pixelformat">
- <description summary="pixel format values">
- Applications can provide buffers as surface content with differernt buffer
- properties. This enum defines all supported buffer configurations.
- </description>
- <entry name="r_8" value="0" summary="8 bit luminance surface"/>
- <entry name="rgb_888" value="1" summary="24 bit rgb surface"/>
- <entry name="rgba_8888" value="2" summary="24 bit rgb surface with 8 bit alpha"/>
- <entry name="rgb_565" value="3" summary="16 bit rgb surface"/>
- <entry name="rgba_5551" value="4" summary="16 bit rgb surface with binary mask"/>
- <entry name="rgba_6661" value="5" summary="18 bit rgb surface with binary mask"/>
- <entry name="rgba_4444" value="6" summary="12 bit rgb surface with 4 bit alpha"/>
- <entry name="unknown" value="7" summary="unknown"/>
- </enum>
-
- <event name="pixelformat">
- <description summary="pixelformat for surface in ivi compositor has changed">
- When client attach buffers as surface content, these buffers have a pixelformat
- configuration. If the pixelformat of a newly attached buffer is different from
- the previous buffer configuration, this event is raised.
- This is also done, when the first buffer is provided by application.
- </description>
- <arg name="pixelformat" type="int"/>
- </event>
-
- <event name="layer">
- <description summary="surface in ivi compositor was added to a layer">
- This surface was added to the render order of the layer defined by argument layer.
- This is essential for a surface to become visible on screen, since ivi compositors
- will only render layers (or more precise all surfaces in the render order of a layer).
- </description>
- <arg name="layer" type="object" interface="ivi_controller_layer" allow-null="true"/>
- </event>
-
- <request name="send_stats">
- <description summary="request statistics for surface in ivi compositor">
- These stats contain information required for monitoring, debugging, logging
- and tracing.
- </description>
- </request>
-
- <event name="stats">
- <description summary="receive updated statistics for surface in ivi compositor">
- The information contained in this event is essential for monitoring, debugging,
- logging and tracing support in IVI systems.
- </description>
- <arg name="redraw_count" type="uint"/>
- <arg name="frame_count" type="uint"/>
- <arg name="update_count" type="uint"/>
- <arg name="pid" type="uint"/>
- <arg name="process_name" type="string" allow-null="true"/>
- </event>
-
- <request name="destroy" type="destructor">
- <description summary="destroy ivi_controller_surface">
- Request to destroy the ivi_controller_surface. If argument
- destroy_scene_object id not 0, the surface will be destroyed in
- ivi compositor. If argument is 0, only the proxy object is destroyed.
- </description>
- <arg name="destroy_scene_object" type="int"/>
- </request>
-
- <event name="destroyed">
- <description summary="ivi_controller_surface was destroyed"/>
- </event>
-
- <enum name="content_state">
- <description summary="all possible states of content for a surface">
- This enum defines all possible content states of a surface. This is
- required, since surfaces in ivi compositor can exist without applications
- providing content for them.
- </description>
- <entry name="content_available" value="1"
- summary="application provided wl_surface for this surface"/>
- <entry name="content_removed" value="2"
- summary="wl_surface was removed for this surface"/>
- </enum>
-
- <event name="content">
- <description summary="content state for surface has changed">
- Surfaces in ivi compositor can exist without any application or controller
- referencing it. All surfaces initially have no content. This event indicates
- when content state has changed. All possible content states are defined
- in enum content_state.
- </description>
- <arg name="content_state" type="int"/>
- </event>
-
- </interface>
-
- <interface name="ivi_controller_layer" version="1">
- <description summary="controller interface to layer in ivi compositor"/>
-
- <request name="set_visibility">
- <description summary="set visibility of layer in ivi compositor">
- If visibility argument is 0, the layer in the ivi compositor is set to invisible.
- If visibility argument is not 0, the layer in the ivi compositor is set to visible.
- </description>
- <arg name="visibility" type="uint"/>
- </request>
-
- <request name="set_opacity">
- <description summary="set opacity of layer in ivi compositor">
- The valid range for opacity is 0.0 (fully transparent) to 1.0 (fully opaque).
- </description>
- <arg name="opacity" type="fixed"/>
- </request>
-
- <request name="set_source_rectangle">
- <description summary="set the scanout area of a layer in ivi compositor">
- The source rectangle defines the part of the layer content, that is used for
- compositing the screen. It can be used, if valid content of the layer is smaller
- than the layer. Effectively it can be used to zoom the content of the layer.
- x: horizontal start position of scanout area within the layer
- y: vertical start position of scanout area within the layer
- width: width of scanout area within the layer
- height: height of scanout area within the layer
- </description>
- <arg name="x" type="int"/>
- <arg name="y" type="int"/>
- <arg name="width" type="int"/>
- <arg name="height" type="int"/>
- </request>
-
- <request name="set_destination_rectangle">
- <description summary="Set the destination area of a layer within a screen">
- The destination rectangle defines the position and size of a layer on a screen.
- The layer will be scaled to this rectangle for rendering.
- x: horizontal start position of layer within the screen
- y: vertical start position of layer within the screen
- width : width of surface within the screen
- height: height of surface within the screen
- </description>
- <arg name="x" type="int"/>
- <arg name="y" type="int"/>
- <arg name="width" type="int"/>
- <arg name="height" type="int"/>
- </request>
-
- <request name="set_configuration">
- <description summary="request new size for layer">
- Layers are created with an initial size, but they can be resized at runtime.
- This request changes the widht and height of a layer.
- </description>
- <arg name="width" type="int"/>
- <arg name="height" type="int"/>
- </request>
-
- <request name="set_orientation">
- <description summary="set the orientation of a layer in ivi compositor">
- The orientation of a layer in ivi compositor can be rotated in 90 degree steps,
- as defined in orientation enum.
- </description>
- <arg name="orientation" type="int"/>
- </request>
-
- <request name="screenshot">
- <description summary="take screenshot of layer">
- Store a screenshot of the layer content in the file provided by argument filename.
- </description>
- <arg name="filename" type="string"/>
- </request>
-
- <request name="clear_surfaces">
- <description summary="remove all surfaces from layer render order">
- A layer has no content assigned to itself, it is a container for surfaces.
- This request removes all surfaces from the layer render order.
- Note: the surfaces are not destroyed, they are just no longer contained by
- the layer.
- </description>
- </request>
-
- <request name="add_surface">
- <description summary="add a surface to layer render order at nearest z-position">
- A layer has no content assigned to itself, it is a container for surfaces.
- This request adds a surface to the topmost position of the layer render order.
- The added surface will cover all other surfaces of the layer.
- </description>
- <arg name="surface" type="object" interface="ivi_controller_surface"/>
- </request>
-
- <request name="remove_surface">
- <description summary="remove a surface from layer render order">
- A layer has no content assigned to itself, it is a container for surfaces.
- This request removes one surfaces from the layer render order.
- Note: the surface is not destroyed, it is just no longer contained by
- the layer.
- </description>
- <arg name="surface" type="object" interface="ivi_controller_surface"/>
- </request>
-
- <request name="set_render_order">
- <description summary="set render order of layer">
- A layer has no content assigned to itself, it is a container for surfaces.
- This request removes all surfaces from the layer render order and set a
- completely new render order.
- </description>
- <arg name="id_surfaces" type="array"/>
- </request>
-
- <event name="visibility">
- <description summary="the visibility of the layer in ivi compositor has changed">
- The new visibility state is provided in argument visibility.
- If visibility is 0, the layer has become invisible.
- If visibility is not 0, the layer has become visible.
- </description>
- <arg name="visibility" type="int"/>
- </event>
-
- <event name="opacity">
- <description summary="the opacity of layer in ivi compositor has changed">
- The new opacity state is provided in argument opacity.
- The valid range for opactiy is 0.0 (fully transparent) to 1.0 (fully opaque).
- </description>
- <arg name="opacity" type="fixed"/>
- </event>
-
- <event name="source_rectangle">
- <description summary="the source rectangle of layer in ivi compositor has changed">
- The scanout region of the layer content has changed.
- The new values for source rectangle are provided by
- x: new horizontal start position of scanout area within the layer
- y: new vertical start position of scanout area within the layer
- width: new width of scanout area within the layer
- height: new height of scanout area within the layer
- </description>
- <arg name="x" type="int"/>
- <arg name="y" type="int"/>
- <arg name="width" type="int"/>
- <arg name="height" type="int"/>
- </event>
-
- <event name="destination_rectangle">
- <description summary="the destination rectangle of layer in ivi compositor has changed">
- The new values for source rectangle are provided by
- x: new horizontal start position of layer within the screen
- y: new vertical start position of layer within the screen
- width : new width of layer within the screen
- height: new height of layer within the screen
- </description>
- <arg name="x" type="int"/>
- <arg name="y" type="int"/>
- <arg name="width" type="int"/>
- <arg name="height" type="int"/>
- </event>
-
- <event name="configuration">
- <description summary="the configuration of layer in ivi compositor has changed">
- The layer was resized. The new layer size is provided by arguments
- width and height.
- </description>
- <arg name="width" type="int"/>
- <arg name="height" type="int"/>
- </event>
-
- <event name="orientation">
- <description summary="the orientation of layer in ivi compositor has changed">
- The new orientation status is provided by argument orientation.
- </description>
- <arg name="orientation" type="int"/>
- </event>
-
- <event name="screen">
- <description summary="layer in ivi compositor was added to a screen">
- This layer was added to the render order of the screen defined by argument screen.
- This is essential for a layer to become visible on screen, since ivi compositors
- will only render screens (or more precise all layers in the render order of a screen).
- </description>
- <arg name="screen" type="object" interface="wl_output" allow-null="true"/>
- </event>
-
- <request name="destroy" type="destructor">
- <description summary="destroy ivi_controller_layer">
- Request to destroy the ivi_controller_layer. If argument
- destroy_scene_object id not 0, the layer will be destroyed in
- ivi compositor. If argument is 0, only the proxy object is destroyed.
- </description>
- <arg name="destroy_scene_object" type="int"/>
- </request>
-
- <event name="destroyed">
- <description summary="destroyed layer event"/>
- </event>
-
- </interface>
-
- <interface name="ivi_controller_screen" version="1">
- <description summary="controller interface to screen in ivi compositor"/>
-
- <request name="destroy" type="destructor">
- <description summary="destroy ivi_controller_screen"/>
- </request>
-
- <request name="clear">
- <description summary="remove all layers from screen render order">
- A screen has no content assigned to itself, it is a container for layers.
- This request removes all layers from the screen render order.
- Note: the layers are not destroyed, they are just no longer contained by
- the screen.
- </description>
- </request>
-
- <request name="add_layer">
- <description summary="add a layer to screen render order at nearest z-position">
- A screen has no content assigned to itself, it is a container for layers.
- This request adds a layers to the topmost position of the screen render order.
- The added layer will cover all other layers of the screen.
- </description>
- <arg name="layer" type="object" interface="ivi_controller_layer"/>
- </request>
-
- <request name="screenshot">
- <description summary="take screenshot of screen">
- Store a screenshot of the screen content in the file provided by argument filename.
- </description>
- <arg name="filename" type="string"/>
- </request>
-
- <request name="set_render_order">
- <description summary="set render order of screen">
- A screen has no content assigned to itself, it is a container for layers.
- This request removes all layers from the screen render order and set a
- completely new render order.
- </description>
- <arg name="id_layers" type="array"/>
- </request>
-
- </interface>
-
- <interface name="ivi_controller" version="1">
- <description summary="interface for ivi controllers to use ivi compositor features"/>
-
- <request name="commit_changes">
- <description summary="commit all changes requested by client">
- All requests are not applied directly to scene object, so a controller
- can set different properties and apply the changes all at once.
- Note: there's an exception to this. Creation and destruction of
- scene objects is executed immediately.
- </description>
- </request>
-
- <event name="screen">
- <description summary="new screen is available">
- A new screen is announced to the controller. This is typically
- the case in two cases:
- 1. controller was just started, ivi compositor announces existing screen
- 2. a new screen was added to the system at runtime
- </description>
- <arg name="id_screen" type="uint"/>
- <arg name="screen" type="new_id" interface="ivi_controller_screen"/>
- </event>
-
- <request name="layer_create">
- <description summary="create layer in ivi compositor">
- layer_create will create a new layer with id_layer in ivi compositor,
- if it does not yet exists. If the layer with id_layer already exists in
- ivi compositor, a handle to the existing layer is returned and width and
- height properties are ignored.
- </description>
- <arg name="id_layer" type="uint"/>
- <arg name="width" type="int"/>
- <arg name="height" type="int"/>
- <arg name="id" type="new_id" interface="ivi_controller_layer"/>
- </request>
-
- <event name="layer">
- <description summary="new layer is available">
- A new layer is announced to the controller.
- </description>
- <arg name="id_layer" type="uint"/>
- </event>
-
- <request name="surface_create">
- <description summary="create surface in ivi compositor">
- surface_create will create a new surface with id_surface in ivi compositor,
- if it does not yet exists. If the surface with id_surface already exists in
- ivi compositor, a handle to the existing surface is returned.
- </description>
- <arg name="id_surface" type="uint"/>
- <arg name="id" type="new_id" interface="ivi_controller_surface"/>
- </request>
-
- <event name="surface">
- <description summary="new surface is available">
- A new surface is announced to the controller.
- </description>
- <arg name="id_surface" type="uint"/>
- </event>
-
- <enum name="object_type">
- <description summary="available object types in ivi compositor scene">
- This enum defines all scene object available in ivi compositor.
- </description>
- <entry name="surface" value="1" summary="surface object type"/>
- <entry name="layer" value="2" summary="layer object type"/>
- <entry name="screen" value="3" summary="screen object type"/>
- </enum>
-
- <enum name="error_code">
- <description summary="possible error codes returned in error event">
- These error codes define all possible error codes returned by ivi compositor
- on server-side errors.
- </description>
- <entry name="unknown_error" value="1" summary="unknown error encountered"/>
- <entry name="file_error" value="2" summary="file i/o error encountered"/>
- </enum>
-
- <event name="error">
- <description summary="server-side error detected">
- The ivi compositor encountered error while processing a request by this
- controller. The error is defined by argument error_code and optional
- error_text. Additionally the object type and id is contained in the error
- event to provide some detailes to handle the error.
- If the controller requires to associate this error event to a request,
- it can
- 1. send request
- 2. force display roundtrip
- 3. check, if error event was received
- but this restricts the controller to have only one open request at a time.
- </description>
- <arg name="object_id" type="int"/>
- <arg name="object_type" type="int"/>
- <arg name="error_code" type="int"/>
- <arg name="error_text" type="string" allow-null="true"/>
- </event>
-
- </interface>
-
-</protocol>
-
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<protocol name="ivi_wm">
+
+ <copyright>
+ Copyright (C) 2017 Advanced Driver Information Technology Joint Venture GmbH
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ </copyright>
+
+ <interface name="ivi_wm_screen" version="1">
+ <description summary="controller interface to screen in ivi compositor"/>
+
+ <request name="destroy" type="destructor">
+ <description summary="destroy ivi_wm_screen">
+ Request to destroy the ivi_wm_screen.
+ </description>
+ </request>
+
+ <request name="clear">
+ <description summary="remove all layers from screen render order">
+ A screen has no content assigned to itself, it is a container for layers.
+ This request removes all layers from the screen render order.
+ Note: the layers are not destroyed, they are just no longer contained by
+ the screen.
+ </description>
+ </request>
+
+ <request name="add_layer">
+ <description summary="add a layer to screen render order at nearest z-position">
+ A screen has no content assigned to itself, it is a container for layers.
+ This request adds a layers to the topmost position of the screen render order.
+ The added layer will cover all other layers of the screen.
+ </description>
+ <arg name="layer_id" type="uint"/>
+ </request>
+
+ <request name="remove_layer">
+ <description summary="remove a layer to screen render order">
+ A screen has no content assigned to itself, it is a container for layers.
+ This request removes a layer.
+ </description>
+ <arg name="layer_id" type="uint"/>
+ </request>
+
+ <request name="screenshot">
+ <description summary="take screenshot of screen">
+ An ivi_screenshot object is created which will receive the screenshot
+ data of the specified output.
+ </description>
+ <arg name="screenshot" type="new_id" interface="ivi_screenshot"/>
+ </request>
+
+ <request name="get">
+ <description summary="get a parameter of a screen in ivi compositor">
+ After this request, compositor sends the requested parameter.
+ </description>
+ <arg name="param" type="int"/>
+ </request>
+
+ <event name="screen_id">
+ <description summary="advertise server side id of the ivi-screen">
+ Sent immediately after creating the ivi_wm_screen object.
+ </description>
+ <arg name="id" type="uint"/>
+ </event>
+
+ <event name="layer_added">
+ <description summary="update render order of the screen">
+ A layer is added to the render order lisf of the screen
+ </description>
+ <arg name="layer_id" type="uint"/>
+ </event>
+
+ <event name="connector_name">
+ <description summary="advertise connector name of the corresponding output">
+ Sent immediately after creating the ivi_wm_screen object.
+ </description>
+ <arg name="process_name" type="string"/>
+ </event>
+
+ <enum name="error">
+ <entry name="no_layer" value="0"
+ summary="the layer with given id does not exist"/>
+ <entry name="no_screen" value="1"
+ summary="the output is already destroyed"/>
+ <entry name="bad_param" value="2"
+ summary="the given parameter is not valid"/>
+ </enum>
+
+ <event name="error">
+ <description summary="error event">
+ The error event is sent out when an error has occurred.
+ </description>
+ <arg name="error" type="uint" summary="error code"/>
+ <arg name="message" type="string" summary="error description"/>
+ </event>
+ </interface>
+
+ <interface name="ivi_screenshot" version="1">
+ <description summary="screenshot of an output or a surface">
+ An ivi_screenshot object receives a single "done" or "error" event.
+ The server will destroy this resource after the event has been send,
+ so the client shall then destroy its proxy too.
+ </description>
+
+ <event name="done">
+ <description summary="screenshot finished">
+ This event contains a filedescriptor for a file with raw image data.
+ Furthermore size, stride, format and timestamp of screenshot are
+ provided.
+ </description>
+ <arg name="fd" type="fd" summary="fd for file containing image data"/>
+ <arg name="width" type="int" summary="image width in pixels"/>
+ <arg name="height" type="int" summary="image height in pixels"/>
+ <arg name="stride" type="int" summary="number of bytes per pixel row"/>
+ <arg name="format" type="uint" summary="image format of type wl_shm.format"/>
+ <arg name="timestamp" type="uint" summary="timestamp in milliseconds"/>
+ </event>
+
+ <enum name="error">
+ <entry name="io_error" value="0"
+ summary="screenshot file could not be created"/>
+ <entry name="not_supported" value="1"
+ summary="screenshot can not be read"/>
+ <entry name="no_output" value="2"
+ summary="output has been destroyed"/>
+ <entry name="no_surface" value="3"
+ summary="surface has been destroyed"/>
+ <entry name="no_content" value="4"
+ summary="surface has no content"/>
+ </enum>
+
+ <event name="error">
+ <description summary="error event">
+ The error event is sent when the screenshot could not be created.
+ </description>
+ <arg name="error" type="uint" enum="error" summary="error code"/>
+ <arg name="message" type="string" summary="error description"/>
+ </event>
+ </interface>
+
+ <interface name="ivi_wm" version="1">
+ <description summary="interface for ivi managers to use ivi compositor features"/>
+
+ <request name="commit_changes">
+ <description summary="commit all changes requested by client">
+ All requests are not applied directly to scene object, so a controller
+ can set different properties and apply the changes all at once.
+ Note: there's an exception to this. Creation and destruction of
+ scene objects is executed immediately.
+ </description>
+ </request>
+
+ <request name="create_screen">
+ <description summary="create a screen in ivi-compositor">
+ Ask the ivi-wm to create a ivi-screen for given wl_output.
+ </description>
+ <arg name="output" type="object" interface="wl_output"/>
+ <arg name="id" type="new_id" interface="ivi_wm_screen" summary="the new ivi-screen"/>
+ </request>
+
+ <request name="set_surface_visibility">
+ <description summary="set the visibility of a surface in ivi compositor">
+ If visibility argument is 0, the surface in the ivi compositor is set to invisible.
+ If visibility argument is not 0, the surface in the ivi compositor is set to visible.
+ </description>
+ <arg name="surface_id" type="uint"/>
+ <arg name="visibility" type="uint"/>
+ </request>
+
+ <request name="set_layer_visibility">
+ <description summary="set visibility of layer in ivi compositor">
+ If visibility argument is 0, the layer in the ivi compositor is set to invisible.
+ If visibility argument is not 0, the layer in the ivi compositor is set to visible.
+ </description>
+ <arg name="layer_id" type="uint"/>
+ <arg name="visibility" type="uint"/>
+ </request>
+
+ <request name="set_surface_opacity">
+ <description summary="set the opacity of a surface in ivi compositor">
+ The valid range for opacity is 0.0 (fully transparent) to 1.0 (fully opaque).
+ </description>
+ <arg name="surface_id" type="uint"/>
+ <arg name="opacity" type="fixed"/>
+ </request>
+
+ <request name="set_layer_opacity">
+ <description summary="set opacity of layer in ivi compositor">
+ The valid range for opacity is 0.0 (fully transparent) to 1.0 (fully opaque).
+ </description>
+ <arg name="layer_id" type="uint"/>
+ <arg name="opacity" type="fixed"/>
+ </request>
+
+ <request name="set_surface_source_rectangle">
+ <description summary="set the scanout area of a surface in ivi compositor">
+ The source rectangle defines the part of the surface content, that is used for
+ compositing the surface. It can be used, if valid content of the surface is smaller
+ than the surface. Effectively it can be used to zoom the content of the surface.
+ If a parameter is less than 0, that value is not changed.
+ x: horizontal start position of scanout area within the surface
+ y: vertical start position of scanout area within the surface
+ width: width of scanout area within the surface
+ height: height of scanout area within the surface
+ </description>
+ <arg name="surface_id" type="uint"/>
+ <arg name="x" type="int"/>
+ <arg name="y" type="int"/>
+ <arg name="width" type="int"/>
+ <arg name="height" type="int"/>
+ </request>
+
+ <request name="set_layer_source_rectangle">
+ <description summary="set the scanout area of a layer in ivi compositor">
+ The source rectangle defines the part of the layer content, that is used for
+ compositing the screen. It can be used, if valid content of the layer is smaller
+ than the layer. Effectively it can be used to zoom the content of the layer.
+ If a parameter is less than 0, that value is not changed.
+ x: horizontal start position of scanout area within the layer
+ y: vertical start position of scanout area within the layer
+ width: width of scanout area within the layer
+ height: height of scanout area within the layer
+ </description>
+ <arg name="layer_id" type="uint"/>
+ <arg name="x" type="int"/>
+ <arg name="y" type="int"/>
+ <arg name="width" type="int"/>
+ <arg name="height" type="int"/>
+ </request>
+
+ <request name="set_surface_destination_rectangle">
+ <description summary="Set the destination area of a surface within a layer">
+ The destination rectangle defines the position and size of a surface on a layer.
+ The surface will be scaled to this rectangle for rendering.
+ If a parameter is less than 0, that value is not changed.
+ x: horizontal start position of surface within the layer
+ y: vertical start position of surface within the layer
+ width : width of surface within the layer
+ height: height of surface within the layer
+ </description>
+ <arg name="surface_id" type="uint"/>
+ <arg name="x" type="int"/>
+ <arg name="y" type="int"/>
+ <arg name="width" type="int"/>
+ <arg name="height" type="int"/>
+ </request>
+
+ <request name="set_layer_destination_rectangle">
+ <description summary="Set the destination area of a layer within a screen">
+ The destination rectangle defines the position and size of a layer on a screen.
+ The layer will be scaled to this rectangle for rendering.
+ If a parameter is less than 0, that value is not changed.
+ x: horizontal start position of layer within the screen
+ y: vertical start position of layer within the screen
+ width : width of surface within the screen
+ height: height of surface within the screen
+ </description>
+ <arg name="layer_id" type="uint"/>
+ <arg name="x" type="int"/>
+ <arg name="y" type="int"/>
+ <arg name="width" type="int"/>
+ <arg name="height" type="int"/>
+ </request>
+
+ <enum name="sync">
+ <description summary="sync request states">
+ </description>
+ <entry name="add" value="0"/>
+ <entry name="remove" value="1"/>
+ </enum>
+
+ <request name="surface_sync">
+ <description summary="request to synchronize of a surface in ivi compositor">
+ After this request, compositor sends the properties of the surface.
+ If sync_state argument is 0, compositor sends the properties continously.
+ If sync_state argument is not 0, compositor stops sending the properties
+ continously.
+ </description>
+ <arg name="surface_id" type="uint"/>
+ <arg name="sync_state" type="int"/>
+ </request>
+
+ <request name="layer_sync">
+ <description summary="request to synchronize of a layer in ivi compositor">
+ After this request, compositor sends the properties of the layer.
+ If sync_state argument is 0, compositor sends the properties continously.
+ If sync_state argument is not 0, compositor stops sending the properties
+ continously.
+ </description>
+ <arg name="layer_id" type="uint"/>
+ <arg name="sync_state" type="int"/>
+ </request>
+
+ <enum name="param" bitfield="true">
+ <description summary="parameter types">
+ The HMI controller can request different types of parameters of an
+ ivi-object.
+ </description>
+ <entry name="opacity" value="1"/>
+ <entry name="visibility" value="2"/>
+ <entry name="size" value="4"/>
+ <entry name="render_order" value="8"/>
+ </enum>
+
+ <request name="surface_get">
+ <description summary="get a parameter of an ivi_layout_surface in ivi compositor">
+ After this request, compositor sends the requested parameter.
+ </description>
+ <arg name="surface_id" type="uint"/>
+ <arg name="param" type="int"/>
+ </request>
+
+ <request name="layer_get">
+ <description summary="get a parameter of an ivi_layout_layer in ivi compositor">
+ After this request, compositor sends the requested parameter.
+ </description>
+ <arg name="layer_id" type="uint"/>
+ <arg name="param" type="int"/>
+ </request>
+
+ <request name="surface_screenshot">
+ <description summary="take screenshot of surface">
+ An ivi_screenshot object is created which will receive an image of the
+ buffer currently attached to the surface with the given id. If there
+ is no surface with such name the server will respond with an
+ ivi_screenshot.error event.
+ </description>
+ <arg name="screenshot" type="new_id" interface="ivi_screenshot"/>
+ <arg name="surface_id" type="uint"/>
+ </request>
+
+ <enum name="surface_type">
+ <description summary="hint for the compositor">
+ If a surface is restricted type, visible contents of the surface is strictly
+ controlled by the compositor. Its content is not allowed to be go out of
+ its destination region. If the application resizes its buffers or uses
+ wp_viewporter protocol to scale its contents, the old destination region
+ would causes visible glitches.
+ To avoid these issues, the controller process mark a surface as desktop
+ compatible. Source and destination regions of a desktop compatible
+ surface will be modified accordingly,when application sends a request
+ for resizing or scaling its contents. Therefore, applications contents
+ will be drawn according to application's wishes.
+ On the other hand, source and destination regions will be strictly
+ enforced, when the surface's type is restricted. The default type for
+ a surface is ivi.
+ </description>
+ <entry name="restricted" value="0" summary="strictly controlled"/>
+ <entry name="desktop" value="1" summary="free to resize and scale"/>
+ </enum>
+
+ <request name="set_surface_type">
+ <description summary="request to set a type for the surface in ivi compositor">
+ After this request, compositor changes the type of the surface.
+ </description>
+ <arg name="surface_id" type="uint"/>
+ <arg name="type" type="int"/>
+ </request>
+
+ <request name="layer_clear">
+ <description summary="remove all surfaces from layer render order">
+ A layer has no content assigned to itself, it is a container for surfaces.
+ This request removes all surfaces from the layer render order.
+ </description>
+ <arg name="layer_id" type="uint"/>
+ </request>
+
+ <request name="layer_add_surface">
+ <description summary="add a surface to layer render order at nearest z-position">
+ A layer has no content assigned to itself, it is a container for surfaces.
+ This request adds a surface to the topmost position of the layer render order.
+ The added surface will cover all other surfaces of the layer.
+ </description>
+ <arg name="layer_id" type="uint"/>
+ <arg name="surface_id" type="uint"/>
+ </request>
+
+ <request name="layer_remove_surface">
+ <description summary="remove a surface from layer render order">
+ A layer has no content assigned to itself, it is a container for surfaces.
+ This request removes one surfaces from the layer render order.
+ Note: the surface is not destroyed, it is just no longer contained by
+ the layer.
+ </description>
+ <arg name="layer_id" type="uint"/>
+ <arg name="surface_id" type="uint"/>
+ </request>
+
+ <request name="create_layout_layer">
+ <description summary="create an ivi_layout_layer in ivi compositor">
+ After this request, compositor creates an ivi_layout_layer
+ </description>
+ <arg name="layer_id" type="uint"/>
+ <arg name="width" type="int"/>
+ <arg name="height" type="int"/>
+ </request>
+
+ <request name="destroy_layout_layer">
+ <description summary="destroy an ivi_layout_layer in ivi compositor">
+ After this request, compositor destroyes an existing ivi_layout_layer.
+ </description>
+ <arg name="layer_id" type="uint"/>
+ </request>
+
+ <event name="surface_visibility">
+ <description summary="the visibility of the surface in ivi compositor has changed">
+ The new visibility state is provided in argument visibility.
+ If visibility is 0, the surface has become invisible.
+ If visibility is not 0, the surface has become visible.
+ </description>
+ <arg name="surface_id" type="uint"/>
+ <arg name="visibility" type="int"/>
+ </event>
+
+ <event name="layer_visibility">
+ <description summary="the visibility of the layer in ivi compositor has changed">
+ The new visibility state is provided in argument visibility.
+ If visibility is 0, the layer has become invisible.
+ If visibility is not 0, the layer has become visible.
+ </description>
+ <arg name="layer_id" type="uint"/>
+ <arg name="visibility" type="int"/>
+ </event>
+
+ <event name="surface_opacity">
+ <description summary="the opacity of surface in ivi compositor has changed">
+ The new opacity state is provided in argument opacity.
+ The valid range for opactiy is 0.0 (fully transparent) to 1.0 (fully opaque).
+ </description>
+ <arg name="surface_id" type="uint"/>
+ <arg name="opacity" type="fixed"/>
+ </event>
+
+ <event name="layer_opacity">
+ <description summary="the opacity of layer in ivi compositor has changed">
+ The new opacity state is provided in argument opacity.
+ The valid range for opactiy is 0.0 (fully transparent) to 1.0 (fully opaque).
+ </description>
+ <arg name="layer_id" type="uint"/>
+ <arg name="opacity" type="fixed"/>
+ </event>
+
+ <event name="surface_source_rectangle">
+ <description summary="the source rectangle of surface in ivi compositor has changed">
+ The scanout region of the surface content has changed.
+ The new values for source rectangle are provided by
+ x: new horizontal start position of scanout area within the surface
+ y: new vertical start position of scanout area within the surface
+ width: new width of scanout area within the surface
+ height: new height of scanout area within the surface
+ </description>
+ <arg name="surface_id" type="uint"/>
+ <arg name="x" type="int"/>
+ <arg name="y" type="int"/>
+ <arg name="width" type="int"/>
+ <arg name="height" type="int"/>
+ </event>
+
+ <event name="layer_source_rectangle">
+ <description summary="the source rectangle of layer in ivi compositor has changed">
+ The scanout region of the layer content has changed.
+ The new values for source rectangle are provided by
+ x: new horizontal start position of scanout area within the layer
+ y: new vertical start position of scanout area within the layer
+ width: new width of scanout area within the layer
+ height: new height of scanout area within the layer
+ </description>
+ <arg name="layer_id" type="uint"/>
+ <arg name="x" type="int"/>
+ <arg name="y" type="int"/>
+ <arg name="width" type="int"/>
+ <arg name="height" type="int"/>
+ </event>
+
+ <event name="surface_destination_rectangle">
+ <description summary="the destination rectangle of surface in ivi compositor has changed">
+ The new values for source rectangle are provided by
+ x: new horizontal start position of surface within the layer
+ y: new vertical start position of surface within the layer
+ width : new width of surface within the layer
+ height: new height of surface within the layer
+ </description>
+ <arg name="surface_id" type="uint"/>
+ <arg name="x" type="int"/>
+ <arg name="y" type="int"/>
+ <arg name="width" type="int"/>
+ <arg name="height" type="int"/>
+ </event>
+
+ <event name="layer_destination_rectangle">
+ <description summary="the destination rectangle of layer in ivi compositor has changed">
+ The new values for source rectangle are provided by
+ x: new horizontal start position of layer within the screen
+ y: new vertical start position of layer within the screen
+ width : new width of layer within the screen
+ height: new height of layer within the screen
+ </description>
+ <arg name="layer_id" type="uint"/>
+ <arg name="x" type="int"/>
+ <arg name="y" type="int"/>
+ <arg name="width" type="int"/>
+ <arg name="height" type="int"/>
+ </event>
+
+ <event name="surface_created">
+ <description summary="ivi_layout_surface was created"/>
+ <arg name="surface_id" type="uint"/>
+ </event>
+
+ <event name="layer_created">
+ <description summary="ivi_layout_layer was created"/>
+ <arg name="layer_id" type="uint"/>
+ </event>
+
+ <event name="surface_destroyed">
+ <description summary="ivi_layout_surface was destroyed"/>
+ <arg name="surface_id" type="uint"/>
+ </event>
+
+ <event name="layer_destroyed">
+ <description summary="ivi_layout_layer was destroyed"/>
+ <arg name="layer_id" type="uint"/>
+ </event>
+
+ <enum name="surface_error">
+ <entry name="no_surface" value="0"
+ summary="the surface with given id does not exist"/>
+ <entry name="bad_param" value="1"
+ summary="the given parameter is not valid"/>
+ <entry name="not_supported" value="2"
+ summary="the request is not supported"/>
+ </enum>
+
+ <event name="surface_error">
+ <description summary="error event">
+ The error event is sent out when an error has occurred.
+ </description>
+ <arg name="object_id" type="uint" summary="id of a layer or surface"/>
+ <arg name="error" type="uint" summary="error code"/>
+ <arg name="message" type="string" summary="error description"/>
+ </event>
+
+ <enum name="layer_error">
+ <entry name="no_surface" value="0"
+ summary="the surface with given id does not exist"/>
+ <entry name="no_layer" value="1"
+ summary="the layer with given id does not exist"/>
+ <entry name="bad_param" value="2"
+ summary="the given parameter is not valid"/>
+ </enum>
+
+ <event name="layer_error">
+ <description summary="error event">
+ The error event is sent out when an error has occurred.
+ </description>
+ <arg name="object_id" type="uint" summary="id of a layer or surface"/>
+ <arg name="error" type="uint" summary="error code"/>
+ <arg name="message" type="string" summary="error description"/>
+ </event>
+
+ <event name="surface_size">
+ <description summary="the surface size in ivi compositor has changed">
+ The client providing content for this surface modified size of the surface.
+ The modified surface size is provided by arguments width and height.
+ </description>
+ <arg name="surface_id" type="uint"/>
+ <arg name="width" type="int"/>
+ <arg name="height" type="int"/>
+ </event>
+
+ <event name="surface_stats">
+ <description summary="receive updated statistics for surface in ivi compositor">
+ The information contained in this event is essential for monitoring, debugging,
+ logging and tracing support in IVI systems.
+ </description>
+ <arg name="surface_id" type="uint"/>
+ <arg name="frame_count" type="uint"/>
+ <arg name="pid" type="uint"/>
+ </event>
+
+ <event name="layer_surface_added">
+ <description summary="update render order of the layer">
+ A surface is added to the render order of the layer
+ </description>
+ <arg name="layer_id" type="uint"/>
+ <arg name="surface_id" type="uint"/>
+ </event>
+ </interface>
+
+</protocol>
+
# limitations under the License.
#
-wlproto(IVI_CON ivi-controller)
+wlproto(IVI_CON ivi-wm)
include(FindPkgConfig)
pkg_check_modules(AFB REQUIRED afb-daemon)
add_library(${TARGETS_WM} MODULE
main.cpp
- wayland.cpp
- wayland.hpp
+ wayland_ivi_wm.cpp
+ wayland_ivi_wm.hpp
util.cpp
util.hpp
layout.cpp
#include "layers.hpp"
#include "layout.hpp"
#include "util.hpp"
-#include "wayland.hpp"
+#include "wayland_ivi_wm.hpp"
#include <cstdio>
#include <memory>
});
this->display->add_global_handler(
- "ivi_controller", [this](wl_registry *r, uint32_t name, uint32_t v) {
+ "ivi_wm", [this](wl_registry *r, uint32_t name, uint32_t v) {
this->controller =
std::make_unique<struct compositor::controller>(r, name, v);
this->outputs.back()->proxy.get(),
wl_proxy_get_id(reinterpret_cast<struct wl_proxy *>(
this->outputs.back()->proxy.get())));
+
+ // Create screen
+ this->controller->create_screen(this->outputs.back()->proxy.get());
+
+ // Set display to controller
+ this->controller->display = this->display;
});
// First level objects
return init_layers();
}
-int App::dispatch_events() {
- if (this->dispatch_events() == 0) {
- return 0;
- }
-
- int ret = this->display->dispatch();
- if (ret == -1) {
- HMI_ERROR("wm", "wl_display_dipatch() returned error %d",
- this->display->get_error());
- return -1;
- }
- this->display->flush();
-
- return 0;
-}
-
int App::dispatch_pending_events() {
if (this->pop_pending_events()) {
this->display->dispatch_pending();
HMI_DEBUG("wm", "surface_set_layout for sub surface %u on layer %u",
*sub_surface_id, layer_id);
- // configure surface to wxh dimensions
- ss->set_configuration(w, h);
- // set source reactangle, even if we should not need to set it.
- ss->set_source_rectangle(0, 0, w, h);
// set destination to the display rectangle
ss->set_destination_rectangle(x + x_off, y + y_off, w, h);
HMI_DEBUG("wm", "surface_set_layout for surface %u on layer %u", surface_id,
layer_id);
- // configure surface to wxh dimensions
- s->set_configuration(w, h);
- // set source reactangle, even if we should not need to set it.
- s->set_source_rectangle(0, 0, w, h);
-
// set destination to the display rectangle
s->set_destination_rectangle(x, y, w, h);
// Commit for configuraton
this->layout_commit();
- if (!(layer->is_normal_layout_only)) {
- // Wait for configuration listener
- controller->is_configured = false;
- while (!(controller->is_configured)) {
- dispatch_pending_events();
- }
- }
-
std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
this->emit_syncdraw(drawing_name, str_area.c_str());
this->enqueue_flushdraw(state.main);
}
state = nl;
- // Commit for configuraton and visibility(0)
+ // Commit for configuration and visibility(0)
this->layout_commit();
- // Wait for configuration listener
- controller->is_configured = false;
- while (!(controller->is_configured)) {
- dispatch_pending_events();
- }
-
std::string str_area_main = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaMain);
std::string str_area_sub = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaSub);
this->emit_syncdraw(main.c_str(), str_area_main.c_str());
// Commit for configuraton and visibility(0)
this->layout_commit();
- if (!(layer->is_normal_layout_only)) {
- // Wait for configuration listener
- controller->is_configured = false;
- while (!(controller->is_configured)) {
- dispatch_pending_events();
- }
- }
-
std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
this->emit_syncdraw(drawing_name, str_area.c_str());
this->enqueue_flushdraw(state.main);
HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", surface_id, *layer_id);
- this->controller->layers[*layer_id]->add_surface(
- this->controller->surfaces[surface_id].get());
+ this->controller->layers[*layer_id]->add_surface(surface_id);
this->layout_commit();
// activate the main_surface right away
/*if (surface_id == static_cast<unsigned>(this->layers.main_surface)) {
// this surface is already created
HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", sid, *lid);
- this->controller->layers[*lid]->add_surface(
- this->controller->surfaces[sid].get());
+ this->controller->layers[*lid]->add_surface(sid);
this->layout_commit();
return nullptr;
// Remove from BG layer (999)
HMI_DEBUG("wm", "Remove %s(%d) from BG layer", label, id);
- this->controller->layers[999]->remove_surface(
- this->controller->surfaces[id].get());
+ this->controller->layers[999]->remove_surface(id);
// Add to FG layer (1001)
HMI_DEBUG("wm", "Add %s(%d) to FG layer", label, id);
- this->controller->layers[1001]->add_surface(
- this->controller->surfaces[id].get());
+ this->controller->layers[1001]->add_surface(id);
for (int j : this->surface_bg) {
HMI_DEBUG("wm", "Stored id:%d", j);
void App::deactivate(int id) {
auto ip = this->controller->sprops.find(id);
- if (ip != this->controller->sprops.end() && ip->second.visibility != 0) {
+ if (ip != this->controller->sprops.end()) {
char const *label =
this->lookup_name(id).value_or("unknown-name").c_str();
// Remove from FG layer (1001)
HMI_DEBUG("wm", "Remove %s(%d) from FG layer", label, id);
- this->controller->layers[1001]->remove_surface(
- this->controller->surfaces[id].get());
+ this->controller->layers[1001]->remove_surface(id);
// Add to BG layer (999)
HMI_DEBUG("wm", "Add %s(%d) to BG layer", label, id);
- this->controller->layers[999]->add_surface(
- this->controller->surfaces[id].get());
+ this->controller->layers[999]->add_surface(id);
for (int j : surface_bg) {
HMI_DEBUG("wm", "Stored id:%d", j);
#include "layout.hpp"
#include "policy.hpp"
#include "result.hpp"
-#include "wayland.hpp"
+#include "wayland_ivi_wm.hpp"
#include "hmi-debug.h"
namespace wl {
int init();
- int dispatch_events();
int dispatch_pending_events();
void set_pending_events();
#define TMCAGLWM_JSON_HELPER_HPP
#include "result.hpp"
-#include "wayland.hpp"
+#include "wayland_ivi_wm.hpp"
#include <json.hpp>
struct json_object;
#include "layout.hpp"
#include "result.hpp"
-#include "wayland.hpp"
+#include "wayland_ivi_wm.hpp"
namespace wm {
#include <string>
#include "result.hpp"
-#include "wayland.hpp"
namespace wm {
#include "result.hpp"
#include "json_helper.hpp"
#include "util.hpp"
-#include "wayland.hpp"
+#include "wayland_ivi_wm.hpp"
extern "C" {
#include <afb/afb-binding.h>
+++ /dev/null
-/*
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <utility>
-
-#include "util.hpp"
-#include "wayland.hpp"
-#include "hmi-debug.h"
-
-/**
- * namespace wl
- */
-namespace wl {
-
-/**
- * display
- */
-display::display()
- : d(std::unique_ptr<struct wl_display, void (*)(struct wl_display *)>(
- wl_display_connect(nullptr), &wl_display_disconnect)),
- r(d.get()) {}
-
-bool display::ok() const { return d && wl_display_get_error(d.get()) == 0; }
-
-void display::roundtrip() { wl_display_roundtrip(this->d.get()); }
-
-int display::dispatch() { return wl_display_dispatch(this->d.get()); }
-
-int display::dispatch_pending() { return wl_display_dispatch_pending(this->d.get()); }
-
-int display::read_events() {
- ST();
- while (wl_display_prepare_read(this->d.get()) == -1) {
- STN(pending_events_dispatch);
- if (wl_display_dispatch_pending(this->d.get()) == -1) {
- return -1;
- }
- }
-
- if (wl_display_flush(this->d.get()) == -1) {
- return -1;
- }
-
- if (wl_display_read_events(this->d.get()) == -1) {
- wl_display_cancel_read(this->d.get());
- }
-
- return 0;
-}
-
-void display::flush() { wl_display_flush(this->d.get()); }
-
-int display::get_fd() const { return wl_display_get_fd(this->d.get()); }
-
-int display::get_error() { return wl_display_get_error(this->d.get()); }
-
-/**
- * registry
- */
-namespace {
-void registry_global(void *data, struct wl_registry * /*r*/, uint32_t name,
- char const *iface, uint32_t v) {
- static_cast<struct registry *>(data)->global(name, iface, v);
-}
-
-void registry_global_remove(void *data, struct wl_registry * /*r*/,
- uint32_t name) {
- static_cast<struct registry *>(data)->global_remove(name);
-}
-
-constexpr struct wl_registry_listener registry_listener = {
- registry_global, registry_global_remove};
-} // namespace
-
-registry::registry(struct wl_display *d)
- : wayland_proxy(d == nullptr ? nullptr : wl_display_get_registry(d)) {
- if (this->proxy != nullptr) {
- wl_registry_add_listener(this->proxy.get(), ®istry_listener, this);
- }
-}
-
-void registry::add_global_handler(char const *iface, binder bind) {
- this->bindings[iface] = std::move(bind);
-}
-
-void registry::global(uint32_t name, char const *iface, uint32_t v) {
- auto b = this->bindings.find(iface);
- if (b != this->bindings.end()) {
- b->second(this->proxy.get(), name, v);
- }
- HMI_DEBUG("wm", "wl::registry @ %p global n %u i %s v %u", this->proxy.get(), name,
- iface, v);
-}
-
-void registry::global_remove(uint32_t /*name*/) {}
-
-/**
- * output
- */
-namespace {
-void output_geometry(void *data, struct wl_output * /*wl_output*/, int32_t x,
- int32_t y, int32_t physical_width, int32_t physical_height,
- int32_t subpixel, const char *make, const char *model,
- int32_t transform) {
- static_cast<struct output *>(data)->geometry(
- x, y, physical_width, physical_height, subpixel, make, model, transform);
-}
-
-void output_mode(void *data, struct wl_output * /*wl_output*/, uint32_t flags,
- int32_t width, int32_t height, int32_t refresh) {
- static_cast<struct output *>(data)->mode(flags, width, height, refresh);
-}
-
-void output_done(void *data, struct wl_output * /*wl_output*/) {
- static_cast<struct output *>(data)->done();
-}
-
-void output_scale(void *data, struct wl_output * /*wl_output*/,
- int32_t factor) {
- static_cast<struct output *>(data)->scale(factor);
-}
-
-constexpr struct wl_output_listener output_listener = {
- output_geometry, output_mode, output_done, output_scale};
-} // namespace
-
-output::output(struct wl_registry *r, uint32_t name, uint32_t v)
- : wayland_proxy(wl_registry_bind(r, name, &wl_output_interface, v)) {
- wl_output_add_listener(this->proxy.get(), &output_listener, this);
-}
-
-void output::geometry(int32_t x, int32_t y, int32_t pw, int32_t ph,
- int32_t subpel, char const *make, char const *model,
- int32_t tx) {
- HMI_DEBUG("wm",
- "wl::output %s @ %p x %i y %i w %i h %i spel %x make %s model %s tx %i",
- __func__, this->proxy.get(), x, y, pw, ph, subpel, make, model, tx);
- this->transform = tx;
-}
-
-void output::mode(uint32_t flags, int32_t w, int32_t h, int32_t r) {
- HMI_DEBUG("wm", "wl::output %s @ %p f %x w %i h %i r %i", __func__,
- this->proxy.get(), flags, w, h, r);
- if ((flags & WL_OUTPUT_MODE_CURRENT) != 0u) {
- this->width = w;
- this->height = h;
- this->refresh = r;
- }
-}
-
-void output::done() {
- HMI_DEBUG("wm", "wl::output %s @ %p done", __func__, this->proxy.get());
- // Pivot and flipped
- if (this->transform == WL_OUTPUT_TRANSFORM_90 ||
- this->transform == WL_OUTPUT_TRANSFORM_270 ||
- this->transform == WL_OUTPUT_TRANSFORM_FLIPPED_90 ||
- this->transform == WL_OUTPUT_TRANSFORM_FLIPPED_270) {
- std::swap(this->width, this->height);
- }
-}
-
-void output::scale(int32_t factor) {
- HMI_DEBUG("wm", "wl::output %s @ %p f %i", __func__, this->proxy.get(), factor);
-}
-} // namespace wl
-
-/**
- * namespace compositor
- */
-namespace compositor {
-
-/**
- * controller
- */
-namespace {
-void controller_screen(void *data, struct ivi_controller * /*ivi_controller*/,
- uint32_t id_screen,
- struct ivi_controller_screen *screen) {
- static_cast<struct controller *>(data)->controller_screen(id_screen, screen);
-}
-
-void controller_layer(void *data, struct ivi_controller * /*ivi_controller*/,
- uint32_t id_layer) {
- static_cast<struct controller *>(data)->controller_layer(id_layer);
-}
-
-void controller_surface(void *data, struct ivi_controller * /*ivi_controller*/,
- uint32_t id_surface) {
- static_cast<struct controller *>(data)->controller_surface(id_surface);
-}
-
-void controller_error(void *data, struct ivi_controller * /*ivi_controller*/,
- int32_t object_id, int32_t object_type,
- int32_t error_code, const char *error_text) {
- static_cast<struct controller *>(data)->controller_error(
- object_id, object_type, error_code, error_text);
-}
-
-constexpr struct ivi_controller_listener listener = {
- controller_screen, controller_layer, controller_surface, controller_error};
-} // namespace compositor
-
-controller::controller(struct wl_registry *r, uint32_t name, uint32_t version)
- : wayland_proxy(
- wl_registry_bind(r, name, &ivi_controller_interface, version)),
- output_size{} {
- ivi_controller_add_listener(this->proxy.get(), &listener, this);
-}
-
-void controller::layer_create(uint32_t id, int32_t w, int32_t h) {
- this->layers[id] = std::make_unique<struct layer>(id, w, h, this);
-}
-
-void controller::surface_create(uint32_t id) {
- this->surfaces[id] = std::make_unique<struct surface>(id, this);
-}
-
-void controller::controller_screen(uint32_t id,
- struct ivi_controller_screen *screen) {
- HMI_DEBUG("wm", "compositor::controller @ %p screen %u (%x) @ %p", this->proxy.get(),
- id, id, screen);
- this->screens[id] = std::make_unique<struct screen>(id, this, screen);
-}
-
-void controller::controller_layer(uint32_t id) {
- HMI_DEBUG("wm", "compositor::controller @ %p layer %u (%x)", this->proxy.get(), id, id);
- if (this->layers.find(id) != this->layers.end()) {
- HMI_DEBUG("wm", "WindowManager has created layer %u (%x) already", id, id);
- } else {
- auto &l = this->layers[id] = std::make_unique<struct layer>(id, this);
- l->clear_surfaces();
- }
-}
-
-void controller::controller_surface(uint32_t id) {
- HMI_DEBUG("wm", "compositor::controller @ %p surface %u (%x)", this->proxy.get(), id,
- id);
- if (this->surfaces.find(id) == this->surfaces.end()) {
- this->surfaces[id] = std::make_unique<struct surface>(id, this);
- this->chooks->surface_created(id);
- }
-}
-
-void controller::controller_error(int32_t object_id, int32_t object_type,
- int32_t error_code, const char *error_text) {
- HMI_DEBUG("wm", "compositor::controller @ %p error o %i t %i c %i text %s",
- this->proxy.get(), object_id, object_type, error_code, error_text);
-}
-
-/**
- * layer
- */
-namespace {
-void layer_visibility(void *data,
- struct ivi_controller_layer * /*ivi_controller_layer*/,
- int32_t visibility) {
- auto l = static_cast<struct layer *>(data);
- l->parent->layer_visibility(l, visibility);
-}
-
-void layer_opacity(void *data,
- struct ivi_controller_layer * /*ivi_controller_layer*/,
- wl_fixed_t opacity) {
- auto l = static_cast<struct layer *>(data);
- l->parent->layer_opacity(l, float(wl_fixed_to_double(opacity)));
-}
-
-void layer_source_rectangle(
- void *data, struct ivi_controller_layer * /*ivi_controller_layer*/,
- int32_t x, int32_t y, int32_t width, int32_t height) {
- auto l = static_cast<struct layer *>(data);
- l->parent->layer_source_rectangle(l, x, y, width, height);
-}
-
-void layer_destination_rectangle(
- void *data, struct ivi_controller_layer * /*ivi_controller_layer*/,
- int32_t x, int32_t y, int32_t width, int32_t height) {
- auto l = static_cast<struct layer *>(data);
- l->parent->layer_destination_rectangle(l, x, y, width, height);
-}
-
-void layer_configuration(void *data,
- struct ivi_controller_layer * /*ivi_controller_layer*/,
- int32_t width, int32_t height) {
- auto l = static_cast<struct layer *>(data);
- l->parent->layer_configuration(l, width, height);
-}
-
-void layer_orientation(void *data,
- struct ivi_controller_layer * /*ivi_controller_layer*/,
- int32_t orientation) {
- auto l = static_cast<struct layer *>(data);
- l->parent->layer_orientation(l, orientation);
-}
-
-void layer_screen(void *data,
- struct ivi_controller_layer * /*ivi_controller_layer*/,
- struct wl_output *screen) {
- auto l = static_cast<struct layer *>(data);
- l->parent->layer_screen(l, screen);
-}
-
-void layer_destroyed(void *data,
- struct ivi_controller_layer * /*ivi_controller_layer*/) {
- auto l = static_cast<struct layer *>(data);
- l->parent->layer_destroyed(l);
-}
-
-constexpr struct ivi_controller_layer_listener layer_listener = {
- layer_visibility, layer_opacity,
- layer_source_rectangle, layer_destination_rectangle,
- layer_configuration, layer_orientation,
- layer_screen, layer_destroyed,
-};
-} // namespace
-
-layer::layer(uint32_t i, struct controller *c) : layer(i, 0, 0, c) {}
-
-layer::layer(uint32_t i, int32_t w, int32_t h, struct controller *c)
- : wayland_proxy(ivi_controller_layer_create(c->proxy.get(), i, w, h),
- [c, i](ivi_controller_layer *l) {
- HMI_DEBUG("wm", "~layer layer %i @ %p", i, l);
- c->remove_proxy_to_id_mapping(l);
- ivi_controller_layer_destroy(l, 1);
- }),
- controller_child(c, i) {
- this->parent->add_proxy_to_id_mapping(this->proxy.get(), i);
- ivi_controller_layer_add_listener(this->proxy.get(), &layer_listener, this);
-}
-
-void layer::set_visibility(uint32_t visibility) {
- ivi_controller_layer_set_visibility(this->proxy.get(), visibility);
-}
-
-void layer::set_opacity(wl_fixed_t opacity) {
- ivi_controller_layer_set_opacity(this->proxy.get(), opacity);
-}
-
-void layer::set_source_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height) {
- ivi_controller_layer_set_source_rectangle(this->proxy.get(), x, y, width,
- height);
-}
-
-void layer::set_destination_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height) {
- ivi_controller_layer_set_destination_rectangle(this->proxy.get(), x, y,
- width, height);
-}
-
-void layer::set_configuration(int32_t width, int32_t height) {
- ivi_controller_layer_set_configuration(this->proxy.get(), width, height);
-}
-
-void layer::set_orientation(int32_t orientation) {
- ivi_controller_layer_set_orientation(this->proxy.get(), orientation);
-}
-
-void layer::screenshot(const char *filename) {
- ivi_controller_layer_screenshot(this->proxy.get(), filename);
-}
-
-void layer::clear_surfaces() {
- ivi_controller_layer_clear_surfaces(this->proxy.get());
-}
-
-void layer::add_surface(struct surface *surface) {
- ivi_controller_layer_add_surface(this->proxy.get(), surface->proxy.get());
-}
-
-void layer::remove_surface(struct surface *surface) {
- ivi_controller_layer_remove_surface(this->proxy.get(), surface->proxy.get());
-}
-
-void layer::set_render_order(std::vector<uint32_t> const &ro) {
- struct wl_array wlro {
- .size = ro.size() * sizeof(ro[0]), .alloc = ro.capacity() * sizeof(ro[0]),
- .data = const_cast<void *>(static_cast<void const *>(ro.data()))
- };
- ivi_controller_layer_set_render_order(this->proxy.get(), &wlro);
-}
-
-void controller::layer_visibility(struct layer *l, int32_t visibility) {
- HMI_DEBUG("wm", "compositor::layer %s @ %d v %i", __func__, l->id, visibility);
- this->lprops[l->id].visibility = visibility;
-}
-
-void controller::layer_opacity(struct layer *l, float opacity) {
- HMI_DEBUG("wm", "compositor::layer %s @ %d o %f", __func__, l->id, opacity);
- this->lprops[l->id].opacity = opacity;
-}
-
-void controller::layer_source_rectangle(struct layer *l, int32_t x, int32_t y,
- int32_t width, int32_t height) {
- HMI_DEBUG("wm", "compositor::layer %s @ %d x %i y %i w %i h %i", __func__,
- l->id, x, y, width, height);
- this->lprops[l->id].src_rect = rect{width, height, x, y};
-}
-
-void controller::layer_destination_rectangle(struct layer *l, int32_t x,
- int32_t y, int32_t width,
- int32_t height) {
- HMI_DEBUG("wm", "compositor::layer %s @ %d x %i y %i w %i h %i", __func__,
- l->id, x, y, width, height);
- this->lprops[l->id].dst_rect = rect{width, height, x, y};
-}
-
-void controller::layer_configuration(struct layer *l, int32_t width,
- int32_t height) {
- HMI_DEBUG("wm", "compositor::layer %s @ %d w %i h %i", __func__, l->id,
- width, height);
- this->lprops[l->id].size = size{uint32_t(width), uint32_t(height)};
-}
-
-void controller::layer_orientation(struct layer *l, int32_t orientation) {
- HMI_DEBUG("wm", "compositor::layer %s @ %d o %i", __func__, l->id,
- orientation);
- this->lprops[l->id].orientation = orientation;
-}
-
-void controller::layer_screen(struct layer *l, struct wl_output *screen) {
- HMI_DEBUG("wm", "compositor::layer %s @ %d s %p", __func__, l->id, screen);
-}
-
-void controller::layer_destroyed(struct layer *l) {
- HMI_DEBUG("wm", "compositor::layer %s @ %d", __func__, l->id);
- this->lprops.erase(l->id);
- this->layers.erase(l->id);
-}
-
-/**
- * surface
- */
-namespace {
-
-void surface_visibility(
- void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
- int32_t visibility) {
- auto s = static_cast<struct surface *>(data);
- s->parent->surface_visibility(s, visibility);
-}
-
-void surface_opacity(void *data,
- struct ivi_controller_surface * /*ivi_controller_surface*/,
- wl_fixed_t opacity) {
- auto s = static_cast<struct surface *>(data);
- s->parent->surface_opacity(s, float(wl_fixed_to_double(opacity)));
-}
-
-void surface_source_rectangle(
- void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
- int32_t x, int32_t y, int32_t width, int32_t height) {
- auto s = static_cast<struct surface *>(data);
- s->parent->surface_source_rectangle(s, x, y, width, height);
-}
-
-void surface_destination_rectangle(
- void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
- int32_t x, int32_t y, int32_t width, int32_t height) {
- auto s = static_cast<struct surface *>(data);
- s->parent->surface_destination_rectangle(s, x, y, width, height);
-}
-
-void surface_configuration(
- void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
- int32_t width, int32_t height) {
- auto s = static_cast<struct surface *>(data);
- s->parent->surface_configuration(s, width, height);
-}
-
-void surface_orientation(
- void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
- int32_t orientation) {
- auto s = static_cast<struct surface *>(data);
- s->parent->surface_orientation(s, orientation);
-}
-
-void surface_pixelformat(
- void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
- int32_t pixelformat) {
- auto s = static_cast<struct surface *>(data);
- s->parent->surface_pixelformat(s, pixelformat);
-}
-
-void surface_layer(void *data,
- struct ivi_controller_surface * /*ivi_controller_surface*/,
- struct ivi_controller_layer *layer) {
- auto s = static_cast<struct surface *>(data);
- s->parent->surface_layer(s, layer);
-}
-
-void surface_stats(void *data,
- struct ivi_controller_surface * /*ivi_controller_surface*/,
- uint32_t redraw_count, uint32_t frame_count,
- uint32_t update_count, uint32_t pid,
- const char *process_name) {
- auto s = static_cast<struct surface *>(data);
- s->parent->surface_stats(s, redraw_count, frame_count, update_count, pid,
- process_name);
-}
-
-void surface_destroyed(
- void *data, struct ivi_controller_surface * /*ivi_controller_surface*/) {
- auto s = static_cast<struct surface *>(data);
- s->parent->surface_destroyed(s);
-}
-
-void surface_content(void *data,
- struct ivi_controller_surface * /*ivi_controller_surface*/,
- int32_t content_state) {
- auto s = static_cast<struct surface *>(data);
- s->parent->surface_content(s, content_state);
-}
-
-constexpr struct ivi_controller_surface_listener surface_listener = {
- surface_visibility,
- surface_opacity,
- surface_source_rectangle,
- surface_destination_rectangle,
- surface_configuration,
- surface_orientation,
- surface_pixelformat,
- surface_layer,
- surface_stats,
- surface_destroyed,
- surface_content,
-};
-} // namespace
-
-surface::surface(uint32_t i, struct controller *c)
- : wayland_proxy(ivi_controller_surface_create(c->proxy.get(), i),
- [c, i](ivi_controller_surface *s) {
- HMI_DEBUG("wm", "~surface surface %i @ %p", i, s);
- c->remove_proxy_to_id_mapping(s);
- ivi_controller_surface_destroy(s, 1);
- }),
- controller_child(c, i) {
- this->parent->add_proxy_to_id_mapping(this->proxy.get(), i);
- ivi_controller_surface_add_listener(this->proxy.get(), &surface_listener,
- this);
-}
-
-void surface::set_visibility(uint32_t visibility) {
- ivi_controller_surface_set_visibility(this->proxy.get(), visibility);
-}
-
-void surface::set_opacity(wl_fixed_t opacity) {
- ivi_controller_surface_set_opacity(this->proxy.get(), opacity);
-}
-
-void surface::set_source_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height) {
- ivi_controller_surface_set_source_rectangle(this->proxy.get(), x, y, width,
- height);
-}
-
-void surface::set_destination_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height) {
- ivi_controller_surface_set_destination_rectangle(this->proxy.get(), x, y,
- width, height);
-}
-
-void surface::set_configuration(int32_t width, int32_t height) {
- ivi_controller_surface_set_configuration(this->proxy.get(), width, height);
-}
-
-void surface::set_orientation(int32_t orientation) {
- ivi_controller_surface_set_orientation(this->proxy.get(), orientation);
-}
-
-void surface::screenshot(const char *filename) {
- ivi_controller_surface_screenshot(this->proxy.get(), filename);
-}
-
-void surface::send_stats() {
- ivi_controller_surface_send_stats(this->proxy.get());
-}
-
-void surface::destroy(int32_t destroy_scene_object) {
- ivi_controller_surface_destroy(this->proxy.get(), destroy_scene_object);
-}
-
-void controller::surface_visibility(struct surface *s, int32_t visibility) {
- HMI_DEBUG("wm", "compositor::surface %s @ %d v %i", __func__, s->id,
- visibility);
- this->sprops[s->id].visibility = visibility;
- this->chooks->surface_visibility(s->id, visibility);
-}
-
-void controller::surface_opacity(struct surface *s, float opacity) {
- HMI_DEBUG("wm", "compositor::surface %s @ %d o %f", __func__, s->id,
- opacity);
- this->sprops[s->id].opacity = opacity;
-}
-
-void controller::surface_source_rectangle(struct surface *s, int32_t x,
- int32_t y, int32_t width,
- int32_t height) {
- HMI_DEBUG("wm", "compositor::surface %s @ %d x %i y %i w %i h %i", __func__,
- s->id, x, y, width, height);
- this->sprops[s->id].src_rect = rect{width, height, x, y};
-}
-
-void controller::surface_destination_rectangle(struct surface *s, int32_t x,
- int32_t y, int32_t width,
- int32_t height) {
- HMI_DEBUG("wm", "compositor::surface %s @ %d x %i y %i w %i h %i", __func__,
- s->id, x, y, width, height);
- this->sprops[s->id].dst_rect = rect{width, height, x, y};
- this->chooks->surface_destination_rectangle(s->id, x, y, width, height);
-}
-
-void controller::surface_configuration(struct surface *s, int32_t width,
- int32_t height) {
- HMI_DEBUG("wm", "compositor::surface %s @ %d w %i h %i", __func__, s->id,
- width, height);
- this->sprops[s->id].size = size{uint32_t(width), uint32_t(height)};
- is_configured = true;
-}
-
-void controller::surface_orientation(struct surface *s, int32_t orientation) {
- HMI_DEBUG("wm", "compositor::surface %s @ %d o %i", __func__, s->id,
- orientation);
- this->sprops[s->id].orientation = orientation;
-}
-
-void controller::surface_pixelformat(struct surface * s,
- int32_t pixelformat) {
- HMI_DEBUG("wm", "compositor::surface %s @ %d f %i", __func__, s->id,
- pixelformat);
-}
-
-void controller::surface_layer(struct surface * s,
- struct ivi_controller_layer *layer) {
- HMI_DEBUG("wm", "compositor::surface %s @ %d l %u @ %p", __func__, s->id,
- this->layer_proxy_to_id[uintptr_t(layer)], layer);
-}
-
-void controller::surface_stats(struct surface *s, uint32_t redraw_count,
- uint32_t frame_count, uint32_t update_count,
- uint32_t pid, const char *process_name) {
- HMI_DEBUG("wm", "compositor::surface %s @ %d r %u f %u u %u pid %u p %s", __func__,
- s->id, redraw_count, frame_count, update_count, pid,
- process_name);
-}
-
-void controller::surface_destroyed(struct surface *s) {
- HMI_DEBUG("wm", "compositor::surface %s @ %d", __func__, s->id);
- this->chooks->surface_removed(s->id);
- this->sprops.erase(s->id);
- this->surfaces.erase(s->id);
-}
-
-void controller::surface_content(struct surface *s, int32_t content_state) {
- HMI_DEBUG("wm", "compositor::surface %s @ %d s %i", __func__, s->id,
- content_state);
- if (content_state == IVI_CONTROLLER_SURFACE_CONTENT_STATE_CONTENT_REMOVED) {
- this->chooks->surface_removed(s->id);
- this->sprops.erase(s->id);
- this->surfaces.erase(s->id);
- }
-}
-
-void controller::add_proxy_to_id_mapping(struct ivi_controller_surface *p,
- uint32_t id) {
- HMI_DEBUG("wm", "Add surface proxy mapping for %p (%u)", p, id);
- this->surface_proxy_to_id[uintptr_t(p)] = id;
- this->sprops[id].id = id;
-}
-
-void controller::remove_proxy_to_id_mapping(struct ivi_controller_surface *p) {
- HMI_DEBUG("wm", "Remove surface proxy mapping for %p", p);
- this->surface_proxy_to_id.erase(uintptr_t(p));
-}
-
-void controller::add_proxy_to_id_mapping(struct ivi_controller_layer *p,
- uint32_t id) {
- HMI_DEBUG("wm", "Add layer proxy mapping for %p (%u)", p, id);
- this->layer_proxy_to_id[uintptr_t(p)] = id;
- this->lprops[id].id = id;
-}
-
-void controller::remove_proxy_to_id_mapping(struct ivi_controller_layer *p) {
- HMI_DEBUG("wm", "Remove layer proxy mapping for %p", p);
- this->layer_proxy_to_id.erase(uintptr_t(p));
-}
-
-void controller::add_proxy_to_id_mapping(struct wl_output *p, uint32_t id) {
- HMI_DEBUG("wm", "Add screen proxy mapping for %p (%u)", p, id);
- this->screen_proxy_to_id[uintptr_t(p)] = id;
-}
-
-void controller::remove_proxy_to_id_mapping(struct wl_output *p) {
- HMI_DEBUG("wm", "Remove screen proxy mapping for %p", p);
- this->screen_proxy_to_id.erase(uintptr_t(p));
-}
-
-/**
- * screen
- */
-screen::screen(uint32_t i, struct controller *c,
- struct ivi_controller_screen *p)
- : wayland_proxy(p), controller_child(c, i) {
- HMI_DEBUG("wm", "compositor::screen @ %p id %u", p, i);
-}
-
-void screen::clear() { ivi_controller_screen_clear(this->proxy.get()); }
-
-void screen::add_layer(layer *l) {
- ivi_controller_screen_add_layer(this->proxy.get(), l->proxy.get());
-}
-
-void screen::set_render_order(std::vector<uint32_t> const &ro) {
- struct wl_array wlro {
- .size = ro.size() * sizeof(ro[0]), .alloc = ro.capacity() * sizeof(ro[0]),
- .data = const_cast<void *>(static_cast<void const *>(ro.data()))
- };
- ivi_controller_screen_set_render_order(this->proxy.get(), &wlro);
-}
-
-} // namespace compositor
--- /dev/null
+/*
+ * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <utility>
+
+#include "util.hpp"
+#include "wayland_ivi_wm.hpp"
+#include "hmi-debug.h"
+
+/**
+ * namespace wl
+ */
+namespace wl {
+
+/**
+ * display
+ */
+display::display()
+ : d(std::unique_ptr<struct wl_display, void (*)(struct wl_display *)>(
+ wl_display_connect(nullptr), &wl_display_disconnect)),
+ r(d.get()) {}
+
+bool display::ok() const { return d && wl_display_get_error(d.get()) == 0; }
+
+void display::roundtrip() { wl_display_roundtrip(this->d.get()); }
+
+int display::dispatch() { return wl_display_dispatch(this->d.get()); }
+
+int display::dispatch_pending() { return wl_display_dispatch_pending(this->d.get()); }
+
+int display::read_events() {
+ ST();
+ while (wl_display_prepare_read(this->d.get()) == -1) {
+ STN(pending_events_dispatch);
+ if (wl_display_dispatch_pending(this->d.get()) == -1) {
+ return -1;
+ }
+ }
+
+ if (wl_display_flush(this->d.get()) == -1) {
+ return -1;
+ }
+
+ if (wl_display_read_events(this->d.get()) == -1) {
+ wl_display_cancel_read(this->d.get());
+ }
+
+ return 0;
+}
+
+void display::flush() { wl_display_flush(this->d.get()); }
+
+int display::get_fd() const { return wl_display_get_fd(this->d.get()); }
+
+int display::get_error() { return wl_display_get_error(this->d.get()); }
+
+/**
+ * registry
+ */
+namespace {
+void registry_global_created(void *data, struct wl_registry * /*r*/, uint32_t name,
+ char const *iface, uint32_t v) {
+ static_cast<struct registry *>(data)->global_created(name, iface, v);
+}
+
+void registry_global_removed(void *data, struct wl_registry * /*r*/,
+ uint32_t name) {
+ static_cast<struct registry *>(data)->global_removed(name);
+}
+
+constexpr struct wl_registry_listener registry_listener = {
+ registry_global_created, registry_global_removed};
+} // namespace
+
+registry::registry(struct wl_display *d)
+ : wayland_proxy(d == nullptr ? nullptr : wl_display_get_registry(d)) {
+ if (this->proxy != nullptr) {
+ wl_registry_add_listener(this->proxy.get(), ®istry_listener, this);
+ }
+}
+
+void registry::add_global_handler(char const *iface, binder bind) {
+ this->bindings[iface] = std::move(bind);
+}
+
+void registry::global_created(uint32_t name, char const *iface, uint32_t v) {
+ auto b = this->bindings.find(iface);
+ if (b != this->bindings.end()) {
+ b->second(this->proxy.get(), name, v);
+ }
+ HMI_DEBUG("wm", "wl::registry @ %p global n %u i %s v %u", this->proxy.get(), name,
+ iface, v);
+}
+
+void registry::global_removed(uint32_t /*name*/) {}
+
+/**
+ * output
+ */
+namespace {
+void output_geometry(void *data, struct wl_output * /*wl_output*/, int32_t x,
+ int32_t y, int32_t physical_width, int32_t physical_height,
+ int32_t subpixel, const char *make, const char *model,
+ int32_t transform) {
+ static_cast<struct output *>(data)->geometry(
+ x, y, physical_width, physical_height, subpixel, make, model, transform);
+}
+
+void output_mode(void *data, struct wl_output * /*wl_output*/, uint32_t flags,
+ int32_t width, int32_t height, int32_t refresh) {
+ static_cast<struct output *>(data)->mode(flags, width, height, refresh);
+}
+
+void output_done(void *data, struct wl_output * /*wl_output*/) {
+ static_cast<struct output *>(data)->done();
+}
+
+void output_scale(void *data, struct wl_output * /*wl_output*/,
+ int32_t factor) {
+ static_cast<struct output *>(data)->scale(factor);
+}
+
+constexpr struct wl_output_listener output_listener = {
+ output_geometry, output_mode, output_done, output_scale};
+} // namespace
+
+output::output(struct wl_registry *r, uint32_t name, uint32_t v)
+ : wayland_proxy(wl_registry_bind(r, name, &wl_output_interface, v)) {
+ wl_output_add_listener(this->proxy.get(), &output_listener, this);
+}
+
+void output::geometry(int32_t x, int32_t y, int32_t pw, int32_t ph,
+ int32_t subpel, char const *make, char const *model,
+ int32_t tx) {
+ HMI_DEBUG("wm",
+ "wl::output %s @ %p x %i y %i w %i h %i spel %x make %s model %s tx %i",
+ __func__, this->proxy.get(), x, y, pw, ph, subpel, make, model, tx);
+ this->transform = tx;
+}
+
+void output::mode(uint32_t flags, int32_t w, int32_t h, int32_t r) {
+ HMI_DEBUG("wm", "wl::output %s @ %p f %x w %i h %i r %i", __func__,
+ this->proxy.get(), flags, w, h, r);
+ if ((flags & WL_OUTPUT_MODE_CURRENT) != 0u) {
+ this->width = w;
+ this->height = h;
+ this->refresh = r;
+ }
+}
+
+void output::done() {
+ HMI_DEBUG("wm", "wl::output %s @ %p done", __func__, this->proxy.get());
+ // Pivot and flipped
+ if (this->transform == WL_OUTPUT_TRANSFORM_90 ||
+ this->transform == WL_OUTPUT_TRANSFORM_270 ||
+ this->transform == WL_OUTPUT_TRANSFORM_FLIPPED_90 ||
+ this->transform == WL_OUTPUT_TRANSFORM_FLIPPED_270) {
+ std::swap(this->width, this->height);
+ }
+}
+
+void output::scale(int32_t factor) {
+ HMI_DEBUG("wm", "wl::output %s @ %p f %i", __func__, this->proxy.get(), factor);
+}
+} // namespace wl
+
+/**
+ * namespace compositor
+ */
+namespace compositor {
+
+namespace {
+
+void surface_visibility_changed(
+ void *data, struct ivi_wm * /*ivi_wm*/,
+ uint32_t surface_id, int32_t visibility) {
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_visibility_changed(s, visibility);
+}
+
+void surface_opacity_changed(void *data, struct ivi_wm * /*ivi_wm*/,
+ uint32_t surface_id, wl_fixed_t opacity) {
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_opacity_changed(s, float(wl_fixed_to_double(opacity)));
+}
+
+void surface_source_rectangle_changed(
+ void *data, struct ivi_wm * /*ivi_wm*/, uint32_t surface_id,
+ int32_t x, int32_t y, int32_t width, int32_t height) {
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_source_rectangle_changed(s, x, y, width, height);
+}
+
+void surface_destination_rectangle_changed(
+ void *data, struct ivi_wm * /*ivi_wm*/, uint32_t surface_id,
+ int32_t x, int32_t y, int32_t width, int32_t height) {
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_destination_rectangle_changed(s, x, y, width, height);
+}
+
+void surface_created(void *data, struct ivi_wm * /*ivi_wm*/,
+ uint32_t id_surface) {
+ static_cast<struct controller *>(data)->surface_created(id_surface);
+}
+
+void surface_destroyed(
+ void *data, struct ivi_wm * /*ivi_wm*/, uint32_t surface_id) {
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_destroyed(s, surface_id);
+}
+
+void surface_error_detected(void *data, struct ivi_wm * /*ivi_wm*/, uint32_t object_id,
+ uint32_t error_code, const char *error_text) {
+ static_cast<struct controller *>(data)->surface_error_detected(
+ object_id, error_code, error_text);
+}
+
+void surface_size_changed(
+ void *data, struct ivi_wm * /*ivi_wm*/, uint32_t surface_id,
+ int32_t width, int32_t height) {
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_size_changed(s, width, height);
+}
+
+void surface_stats_received(void *data, struct ivi_wm * /*ivi_wm*/,
+ uint32_t surface_id, uint32_t frame_count, uint32_t pid) {
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_stats_received(s, surface_id, frame_count, pid);
+}
+
+void surface_added_to_layer(void *data, struct ivi_wm * /*ivi_wm*/,
+ uint32_t layer_id, uint32_t surface_id) {
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_added_to_layer(s, layer_id, surface_id);
+}
+
+void layer_visibility_changed(void *data, struct ivi_wm * /*ivi_wm*/,
+ uint32_t layer_id, int32_t visibility) {
+ auto l = static_cast<struct layer *>(data);
+ l->parent->layer_visibility_changed(l, layer_id, visibility);
+}
+
+void layer_opacity_changed(void *data, struct ivi_wm * /*ivi_wm*/,
+ uint32_t layer_id, wl_fixed_t opacity) {
+ auto l = static_cast<struct layer *>(data);
+ l->parent->layer_opacity_changed(l, layer_id, float(wl_fixed_to_double(opacity)));
+}
+
+void layer_source_rectangle_changed(
+ void *data, struct ivi_wm * /*ivi_wm*/, uint32_t layer_id,
+ int32_t x, int32_t y, int32_t width, int32_t height) {
+ auto l = static_cast<struct layer *>(data);
+ l->parent->layer_source_rectangle_changed(l, layer_id, x, y, width, height);
+}
+
+void layer_destination_rectangle_changed(
+ void *data, struct ivi_wm * /*ivi_wm*/, uint32_t layer_id,
+ int32_t x, int32_t y, int32_t width, int32_t height) {
+ auto l = static_cast<struct layer *>(data);
+ l->parent->layer_destination_rectangle_changed(l, layer_id, x, y, width, height);
+}
+
+void layer_created(void *data, struct ivi_wm * /*ivi_wm*/,
+ uint32_t id_layer) {
+ static_cast<struct controller *>(data)->layer_created(id_layer);
+}
+
+void layer_destroyed(void *data, struct ivi_wm * /*ivi_wm*/, uint32_t layer_id) {
+ auto l = static_cast<struct layer *>(data);
+ l->parent->layer_destroyed(l, layer_id);
+}
+
+void layer_error_detected(void *data, struct ivi_wm * /*ivi_wm*/, uint32_t object_id,
+ uint32_t error_code, const char *error_text) {
+ static_cast<struct controller *>(data)->layer_error_detected(
+ object_id, error_code, error_text);
+}
+
+constexpr struct ivi_wm_listener listener = {
+ surface_visibility_changed, layer_visibility_changed,
+ surface_opacity_changed, layer_opacity_changed,
+ surface_source_rectangle_changed, layer_source_rectangle_changed,
+ surface_destination_rectangle_changed, layer_destination_rectangle_changed,
+ surface_created, layer_created,
+ surface_destroyed, layer_destroyed,
+ surface_error_detected, layer_error_detected,
+ surface_size_changed,
+ surface_stats_received,
+ surface_added_to_layer,
+};
+
+void screen_created(void *data, struct ivi_wm_screen *ivi_wm_screen, uint32_t id) {
+ static_cast<struct screen *>(data)->screen_created((struct screen *)data, id);
+}
+
+void layer_added(void *data,
+ struct ivi_wm_screen *ivi_wm_screen,
+ uint32_t layer_id) {
+ HMI_DEBUG("wm", "added layer_id:%d", layer_id);
+}
+
+void connector_name(void *data,
+ struct ivi_wm_screen *ivi_wm_screen,
+ const char *process_name) {
+ HMI_DEBUG("wm", "process_name:%s", process_name);
+}
+
+void screen_error(void *data,
+ struct ivi_wm_screen *ivi_wm_screen,
+ uint32_t error,
+ const char *message) {
+ HMI_DEBUG("wm", "screen error:%d message:%s", error, message);
+}
+
+constexpr struct ivi_wm_screen_listener screen_listener = {
+ screen_created,
+ layer_added,
+ connector_name,
+ screen_error,
+};
+} // namespace
+
+/**
+ * surface
+ */
+surface::surface(uint32_t i, struct controller *c)
+ : controller_child(c, i) {
+ this->parent->add_proxy_to_sid_mapping(this->parent->proxy.get(), i);
+}
+
+void surface::set_visibility(uint32_t visibility) {
+ HMI_DEBUG("wm", "compositor::surface id:%d v:%d", this->id, visibility);
+ ivi_wm_set_surface_visibility(this->parent->proxy.get(), this->id, visibility);
+}
+
+void surface::set_source_rectangle(int32_t x, int32_t y,
+ int32_t width, int32_t height) {
+ ivi_wm_set_surface_source_rectangle(this->parent->proxy.get(), this->id,
+ x, y, width, height);
+}
+
+void surface::set_destination_rectangle(int32_t x, int32_t y,
+ int32_t width, int32_t height) {
+ ivi_wm_set_surface_destination_rectangle(this->parent->proxy.get(), this->id,
+ x, y, width, height);
+}
+
+
+/**
+ * layer
+ */
+layer::layer(uint32_t i, struct controller *c) : layer(i, 0, 0, c) {}
+
+layer::layer(uint32_t i, int32_t w, int32_t h, struct controller *c)
+ : controller_child(c, i) {
+ this->parent->add_proxy_to_lid_mapping(this->parent->proxy.get(), i);
+ ivi_wm_create_layout_layer(c->proxy.get(), i, w, h);
+}
+
+void layer::set_visibility(uint32_t visibility) {
+ ivi_wm_set_layer_visibility(this->parent->proxy.get(), this->id, visibility);
+}
+
+void layer::set_destination_rectangle(int32_t x, int32_t y,
+ int32_t width, int32_t height) {
+ ivi_wm_set_layer_destination_rectangle(this->parent->proxy.get(), this->id,
+ x, y, width, height);
+}
+
+void layer::add_surface(uint32_t surface_id) {
+ ivi_wm_layer_add_surface(this->parent->proxy.get(), this->id, surface_id);
+}
+
+void layer::remove_surface(uint32_t surface_id) {
+ ivi_wm_layer_remove_surface(this->parent->proxy.get(), this->id, surface_id);
+}
+
+
+/**
+ * screen
+ */
+screen::screen(uint32_t i, struct controller *c, struct wl_output *o)
+ : wayland_proxy(ivi_wm_create_screen(c->proxy.get(), o)),
+ controller_child(c, i) {
+ HMI_DEBUG("wm", "compositor::screen @ %p id %u o %p", this->proxy.get(), i, o);
+
+ // Add listener for screen
+ ivi_wm_screen_add_listener(this->proxy.get(), &screen_listener, this);
+}
+
+void screen::clear() { ivi_wm_screen_clear(this->proxy.get()); }
+
+void screen::screen_created(struct screen *screen, uint32_t id) {
+ HMI_DEBUG("wm", "compositor::screen @ %p screen %u (%x) @ %p", this->proxy.get(),
+ id, id, screen);
+ this->id = id;
+ this->parent->screens[id] = screen;
+}
+
+void screen::set_render_order(std::vector<uint32_t> const &ro) {
+ std::size_t i;
+
+ // Remove all layers from the screen render order
+ ivi_wm_screen_clear(this->proxy.get());
+
+ for (i = 0; i < ro.size(); i++) {
+ HMI_DEBUG("wm", "compositor::screen @ %p add layer %u", this->proxy.get(), ro[i]);
+ // Add the layer to screen render order at nearest z-position
+ ivi_wm_screen_add_layer(this->proxy.get(), ro[i]);
+ }
+}
+
+
+/**
+ * controller
+ */
+controller::controller(struct wl_registry *r, uint32_t name, uint32_t version)
+ : wayland_proxy(
+ wl_registry_bind(r, name, &ivi_wm_interface, version)),
+ output_size{} {
+ ivi_wm_add_listener(this->proxy.get(), &listener, this);
+}
+
+void controller::layer_create(uint32_t id, int32_t w, int32_t h) {
+ this->layers[id] = std::make_unique<struct layer>(id, w, h, this);
+}
+
+void controller::surface_create(uint32_t id) {
+ this->surfaces[id] = std::make_unique<struct surface>(id, this);
+
+ // TODO: If Clipping is necessary, this process should be modified.
+ {
+ // Set surface type:IVI_WM_SURFACE_TYPE_DESKTOP)
+ // for resizing wayland surface when switching from split to full surface.
+ ivi_wm_set_surface_type(this->proxy.get(), id, IVI_WM_SURFACE_TYPE_DESKTOP);
+
+ // Set source reactangle even if we should not need to set it
+ // for enable setting for destination region.
+ this->surfaces[id]->set_source_rectangle(0, 0, this->output_size.w, this->output_size.h);
+
+ // Flush display
+ this->display->flush();
+ }
+}
+
+void controller::create_screen(struct wl_output *output) {
+ // TODO: screen id is 0 (WM manages one screen for now)
+ this->screen = std::make_unique<struct screen>(0, this, output);
+}
+
+void controller::layer_created(uint32_t id) {
+ HMI_DEBUG("wm", "compositor::controller @ %p layer %u (%x)", this->proxy.get(), id, id);
+ if (this->layers.find(id) != this->layers.end()) {
+ HMI_DEBUG("wm", "WindowManager has created layer %u (%x) already", id, id);
+ } else {
+ this->layers[id] = std::make_unique<struct layer>(id, this);
+ }
+}
+
+void controller::layer_error_detected(uint32_t object_id,
+ uint32_t error_code, const char *error_text) {
+ HMI_DEBUG("wm", "compositor::controller @ %p error o %d c %d text %s",
+ this->proxy.get(), object_id, error_code, error_text);
+}
+
+void controller::surface_visibility_changed(struct surface *s, int32_t visibility) {
+ HMI_DEBUG("wm", "compositor::surface %s @ %d v %i", __func__, s->id,
+ visibility);
+ this->sprops[s->id].visibility = visibility;
+ this->chooks->surface_visibility(s->id, visibility);
+}
+
+void controller::surface_opacity_changed(struct surface *s, float opacity) {
+ HMI_DEBUG("wm", "compositor::surface %s @ %d o %f", __func__, s->id,
+ opacity);
+ this->sprops[s->id].opacity = opacity;
+}
+
+void controller::surface_source_rectangle_changed(struct surface *s, int32_t x,
+ int32_t y, int32_t width,
+ int32_t height) {
+ HMI_DEBUG("wm", "compositor::surface %s @ %d x %i y %i w %i h %i", __func__,
+ s->id, x, y, width, height);
+ this->sprops[s->id].src_rect = rect{width, height, x, y};
+}
+
+void controller::surface_destination_rectangle_changed(struct surface *s, int32_t x,
+ int32_t y, int32_t width,
+ int32_t height) {
+ HMI_DEBUG("wm", "compositor::surface %s @ %d x %i y %i w %i h %i", __func__,
+ s->id, x, y, width, height);
+ this->sprops[s->id].dst_rect = rect{width, height, x, y};
+ this->chooks->surface_destination_rectangle(s->id, x, y, width, height);
+}
+
+void controller::surface_size_changed(struct surface *s, int32_t width,
+ int32_t height) {
+ HMI_DEBUG("wm", "compositor::surface %s @ %d w %i h %i", __func__, s->id,
+ width, height);
+ this->sprops[s->id].size = size{uint32_t(width), uint32_t(height)};
+}
+
+void controller::surface_added_to_layer(struct surface * s,
+ uint32_t layer_id, uint32_t surface_id) {
+ HMI_DEBUG("wm", "compositor::surface %s @ %d l %u",
+ __func__, layer_id, surface_id);
+}
+
+void controller::surface_stats_received(struct surface *s, uint32_t surface_id,
+ uint32_t frame_count, uint32_t pid) {
+ HMI_DEBUG("wm", "compositor::surface %s @ %d f %u pid %u",
+ __func__, surface_id, frame_count, pid);
+}
+
+void controller::surface_created(uint32_t id) {
+ HMI_DEBUG("wm", "compositor::controller @ %p surface %u (%x)", this->proxy.get(), id,
+ id);
+ if (this->surfaces.find(id) == this->surfaces.end()) {
+ this->surfaces[id] = std::make_unique<struct surface>(id, this);
+ this->chooks->surface_created(id);
+
+ // TODO: If Clipping is necessary, this process should be modified.
+ {
+ // Set surface type:IVI_WM_SURFACE_TYPE_DESKTOP)
+ // for resizing wayland surface when switching from split to full surface.
+ ivi_wm_set_surface_type(this->proxy.get(), id, IVI_WM_SURFACE_TYPE_DESKTOP);
+
+ // Set source reactangle even if we should not need to set it
+ // for enable setting for destination region.
+ this->surfaces[id]->set_source_rectangle(0, 0, this->output_size.w, this->output_size.h);
+
+ // Flush display
+ this->display->flush();
+ }
+ }
+}
+
+void controller::surface_destroyed(struct surface *s, uint32_t surface_id) {
+ HMI_DEBUG("wm", "compositor::surface %s @ %d", __func__, surface_id);
+ this->chooks->surface_removed(surface_id);
+ this->sprops.erase(surface_id);
+ this->surfaces.erase(surface_id);
+}
+
+void controller::surface_error_detected(uint32_t object_id,
+ uint32_t error_code, const char *error_text) {
+ HMI_DEBUG("wm", "compositor::controller @ %p error o %d c %d text %s",
+ this->proxy.get(), object_id, error_code, error_text);
+}
+
+void controller::layer_visibility_changed(struct layer *l, uint32_t layer_id, int32_t visibility) {
+ HMI_DEBUG("wm", "compositor::layer %s @ %d v %i", __func__, layer_id, visibility);
+ this->lprops[layer_id].visibility = visibility;
+}
+
+void controller::layer_opacity_changed(struct layer *l, uint32_t layer_id, float opacity) {
+ HMI_DEBUG("wm", "compositor::layer %s @ %d o %f", __func__, layer_id, opacity);
+ this->lprops[layer_id].opacity = opacity;
+}
+
+void controller::layer_source_rectangle_changed(struct layer *l, uint32_t layer_id,
+ int32_t x, int32_t y,
+ int32_t width, int32_t height) {
+ HMI_DEBUG("wm", "compositor::layer %s @ %d x %i y %i w %i h %i",
+ __func__, layer_id, x, y, width, height);
+ this->lprops[layer_id].src_rect = rect{width, height, x, y};
+}
+
+void controller::layer_destination_rectangle_changed(struct layer *l, uint32_t layer_id,
+ int32_t x, int32_t y,
+ int32_t width, int32_t height) {
+ HMI_DEBUG("wm", "compositor::layer %s @ %d x %i y %i w %i h %i",
+ __func__, layer_id, x, y, width, height);
+ this->lprops[layer_id].dst_rect = rect{width, height, x, y};
+}
+
+void controller::layer_configuration(struct layer *l, int32_t width,
+ int32_t height) {
+ HMI_DEBUG("wm", "compositor::layer %s @ %d w %i h %i", __func__, l->id,
+ width, height);
+ this->lprops[l->id].size = size{uint32_t(width), uint32_t(height)};
+}
+
+void controller::layer_orientation(struct layer *l, int32_t orientation) {
+ HMI_DEBUG("wm", "compositor::layer %s @ %d o %i", __func__, l->id,
+ orientation);
+ this->lprops[l->id].orientation = orientation;
+}
+
+void controller::layer_screen(struct layer *l, struct wl_output *screen) {
+ HMI_DEBUG("wm", "compositor::layer %s @ %d s %p", __func__, l->id, screen);
+}
+
+void controller::layer_destroyed(struct layer *l, uint32_t layer_id) {
+ HMI_DEBUG("wm", "compositor::layer %s @ %d", __func__, layer_id);
+ this->lprops.erase(layer_id);
+ this->layers.erase(layer_id);
+}
+
+void controller::add_proxy_to_sid_mapping(struct ivi_wm *p,
+ uint32_t id) {
+ HMI_DEBUG("wm", "Add surface proxy mapping for %p (%u)", p, id);
+ this->surface_proxy_to_id[uintptr_t(p)] = id;
+ this->sprops[id].id = id;
+}
+
+void controller::remove_proxy_to_sid_mapping(struct ivi_wm *p) {
+ HMI_DEBUG("wm", "Remove surface proxy mapping for %p", p);
+ this->surface_proxy_to_id.erase(uintptr_t(p));
+}
+
+void controller::add_proxy_to_lid_mapping(struct ivi_wm *p,
+ uint32_t id) {
+ HMI_DEBUG("wm", "Add layer proxy mapping for %p (%u)", p, id);
+ this->layer_proxy_to_id[uintptr_t(p)] = id;
+ this->lprops[id].id = id;
+}
+
+void controller::remove_proxy_to_lid_mapping(struct ivi_wm *p) {
+ HMI_DEBUG("wm", "Remove layer proxy mapping for %p", p);
+ this->layer_proxy_to_id.erase(uintptr_t(p));
+}
+
+void controller::add_proxy_to_id_mapping(struct wl_output *p, uint32_t id) {
+ HMI_DEBUG("wm", "Add screen proxy mapping for %p (%u)", p, id);
+ this->screen_proxy_to_id[uintptr_t(p)] = id;
+}
+
+void controller::remove_proxy_to_id_mapping(struct wl_output *p) {
+ HMI_DEBUG("wm", "Remove screen proxy mapping for %p", p);
+ this->screen_proxy_to_id.erase(uintptr_t(p));
+}
+
+} // namespace compositor
#define WM_WAYLAND_HPP
#include "controller_hooks.hpp"
-#include "ivi-controller-client-protocol.h"
+#include "ivi-wm-client-protocol.h"
#include "util.hpp"
#include <functional>
void add_global_handler(char const *iface, binder bind);
// Events
- void global(uint32_t name, char const *iface, uint32_t v);
- void global_remove(uint32_t name);
+ void global_created(uint32_t name, char const *iface, uint32_t v);
+ void global_removed(uint32_t name);
};
/**
/**
* @struct output
*/
-struct output : wayland_proxy<struct wl_output> {
+struct output : public wayland_proxy<struct wl_output> {
int width{};
int height{};
int refresh{};
/**
* @struct surface
*/
-struct surface : public wayland_proxy<struct ivi_controller_surface>,
- controller_child {
+struct surface : public controller_child {
surface(surface const &) = delete;
surface &operator=(surface const &) = delete;
surface(uint32_t i, struct controller *c);
// Requests
void set_visibility(uint32_t visibility);
- void set_opacity(wl_fixed_t opacity);
- void set_source_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height);
- void set_destination_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height);
- void set_configuration(int32_t width, int32_t height);
- void set_orientation(int32_t orientation);
- void screenshot(const char *filename);
- void send_stats();
- void destroy(int32_t destroy_scene_object);
+ void set_source_rectangle(int32_t x, int32_t y,
+ int32_t width, int32_t height);
+ void set_destination_rectangle(int32_t x, int32_t y,
+ int32_t width, int32_t height);
};
/**
* @struct layer
*/
-struct layer : public wayland_proxy<struct ivi_controller_layer>,
- controller_child {
+struct layer : public controller_child {
layer(layer const &) = delete;
layer &operator=(layer const &) = delete;
layer(uint32_t i, struct controller *c);
// Requests
void set_visibility(uint32_t visibility);
- void set_opacity(wl_fixed_t opacity);
- void set_source_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height);
- void set_destination_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height);
- void set_configuration(int32_t width, int32_t height);
- void set_orientation(int32_t orientation);
- void screenshot(const char *filename);
- void clear_surfaces();
- void add_surface(struct surface *surface);
- void remove_surface(struct surface *surface);
- void set_render_order(std::vector<uint32_t> const &ro);
+ void set_destination_rectangle(int32_t x, int32_t y,
+ int32_t width, int32_t height);
+ void add_surface(uint32_t surface_id);
+ void remove_surface(uint32_t surface_id);
};
/**
* @struct screen
*/
-struct screen : public wayland_proxy<struct ivi_controller_screen>,
- controller_child {
+struct screen : public wayland_proxy<struct ivi_wm_screen>,
+ public controller_child {
screen(screen const &) = delete;
screen &operator=(screen const &) = delete;
- screen(uint32_t i, struct controller *c, struct ivi_controller_screen *p);
+ screen(uint32_t i, struct controller *c, struct wl_output *o);
+
void clear();
- void add_layer(layer *l);
+ void screen_created(struct screen *screen, uint32_t id);
void set_render_order(std::vector<uint32_t> const &ro);
};
/**
* @struct controller
*/
-struct controller : public wayland_proxy<struct ivi_controller> {
+struct controller : public wayland_proxy<struct ivi_wm> {
// This controller is still missing ivi-input
typedef std::unordered_map<uintptr_t, uint32_t> proxy_to_id_map_type;
surface_map_type;
typedef std::unordered_map<uint32_t, std::unique_ptr<struct layer>>
layer_map_type;
- typedef std::unordered_map<uint32_t, std::unique_ptr<struct screen>>
- screen_map_type;
-
+ typedef std::unordered_map<uint32_t, struct screen *> screen_map_type;
typedef std::unordered_map<uint32_t, struct surface_properties> props_map;
// HACK:
layer_map_type layers;
screen_map_type screens;
+ std::unique_ptr<struct screen> screen;
+
size output_size;
wm::controller_hooks *chooks;
- bool is_configured;
+ struct wl::display *display;
+
+ void add_proxy_to_sid_mapping(struct ivi_wm *p, uint32_t id);
+ void remove_proxy_to_sid_mapping(struct ivi_wm *p);
+
+ void add_proxy_to_lid_mapping(struct ivi_wm *p, uint32_t id);
+ void remove_proxy_to_lid_mapping(struct ivi_wm *p);
- void add_proxy_to_id_mapping(struct ivi_controller_surface *p, uint32_t id);
- void remove_proxy_to_id_mapping(struct ivi_controller_surface *p);
- void add_proxy_to_id_mapping(struct ivi_controller_layer *p, uint32_t id);
- void remove_proxy_to_id_mapping(struct ivi_controller_layer *p);
void add_proxy_to_id_mapping(struct wl_output *p, uint32_t id);
void remove_proxy_to_id_mapping(struct wl_output *p);
// Requests
void commit_changes() const {
- ivi_controller_commit_changes(this->proxy.get());
+ ivi_wm_commit_changes(this->proxy.get());
}
void layer_create(uint32_t id, int32_t w, int32_t h);
void surface_create(uint32_t id);
+ void create_screen(struct wl_output *output);
// Events
- // controller
- void controller_screen(uint32_t id, struct ivi_controller_screen *screen);
- void controller_layer(uint32_t id);
- void controller_surface(uint32_t id);
- void controller_error(int32_t object_id, int32_t object_type,
- int32_t error_code, char const *error_text);
-
- // surface
- void surface_visibility(struct surface *s, int32_t visibility);
- void surface_opacity(struct surface *s, float opacity);
- void surface_source_rectangle(struct surface *s, int32_t x, int32_t y,
+ void surface_visibility_changed(struct surface *s, int32_t visibility);
+ void surface_opacity_changed(struct surface *s, float opacity);
+ void surface_source_rectangle_changed(struct surface *s, int32_t x, int32_t y,
int32_t width, int32_t height);
- void surface_destination_rectangle(struct surface *s, int32_t x, int32_t y,
+ void surface_destination_rectangle_changed(struct surface *s, int32_t x, int32_t y,
int32_t width, int32_t height);
- void surface_configuration(struct surface *s, int32_t width, int32_t height);
- void surface_orientation(struct surface *s, int32_t orientation);
- void surface_pixelformat(struct surface *s, int32_t pixelformat);
- void surface_layer(struct surface *s, struct ivi_controller_layer *layer);
- void surface_stats(struct surface *s, uint32_t redraw_count,
- uint32_t frame_count, uint32_t update_count, uint32_t pid,
- const char *process_name);
- void surface_destroyed(struct surface *s);
- void surface_content(struct surface *s, int32_t content_state);
-
- // layer
- void layer_visibility(struct layer *l, int32_t visibility);
- void layer_opacity(struct layer *l, float opacity);
- void layer_source_rectangle(struct layer *l, int32_t x, int32_t y,
+ void surface_created(uint32_t id);
+ void surface_destroyed(struct surface *s, uint32_t surface_id);
+ void surface_error_detected(uint32_t object_id,
+ uint32_t error_code, char const *error_text);
+ void surface_size_changed(struct surface *s, int32_t width, int32_t height);
+ void surface_stats_received(struct surface *s, uint32_t surface_id,
+ uint32_t frame_count, uint32_t pid);
+ void surface_added_to_layer(struct surface *s, uint32_t layer_id, uint32_t surface_id);
+
+ void layer_visibility_changed(struct layer *l, uint32_t layer_id,int32_t visibility);
+ void layer_opacity_changed(struct layer *l, uint32_t layer_id,float opacity);
+ void layer_source_rectangle_changed(struct layer *l, uint32_t layer_id,int32_t x, int32_t y,
int32_t width, int32_t height);
- void layer_destination_rectangle(struct layer *l, int32_t x, int32_t y,
+ void layer_destination_rectangle_changed(struct layer *l, uint32_t layer_id,int32_t x, int32_t y,
int32_t width, int32_t height);
+ void layer_created(uint32_t id);
+ void layer_destroyed(struct layer *l, uint32_t layer_id);
+ void layer_error_detected(uint32_t object_id,
+ uint32_t error_code, char const *error_text);
void layer_configuration(struct layer *l, int32_t width, int32_t height);
void layer_orientation(struct layer *l, int32_t orientation);
void layer_screen(struct layer *l, struct wl_output *screen);
- void layer_destroyed(struct layer *l);
+
};
} // namespace compositor
Code Review / apps / agl-service-windowmanager-2017.git / commitdiff