Remove unnecessary filessandbox/knimitz/ces2019

Those files are not used anymore

Change-Id: Idd9a518f229f06a38187d7615022b2844a4a0d98
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>

7 files changed, 0 insertions, 2326 deletions

diff --git a/layers_setting.json b/layers_setting.json
deleted file mode 100644
index 1b58a3a..0000000
--- a/layers_setting.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "description": "Layer mapping",
-    "mappings": [
-        {
-            "name": "BackGroundLayer",
-            "role" : "map|radio|music|video",
-            "type" : "stack",
-            "id_range_begin": 0,
-            "id_range_end": 0,
-            "comment": "Work Around: This is evacuation layer that not stopping event loop"
-        },
-        {
-            "name": "FarHomeScreen",
-            "role": "",
-            "type": "stack",
-            "id_range_begin": 100,
-            "id_range_end": 199,
-            "comment": "FarHomeScreen is the part of HomeScreen. The z order of this layer is lower than NearHomeScreen"
-        },
-        {
-            "name": "Apps",
-            "role": "music|video|browser|radio|phone|map|navigation|hvac|settings|dashboard|poi|mixer|sdl|launcher|receiver|tachometer|fallback",
-            "type": "tile",
-            "id_range_begin": 1000,
-            "id_range_end": 2999,
-            "comment": "Range of IDs that will always be placed on layer 1001"
-        },
-        {
-            "name": "NearHomeScreen",
-            "role": "homescreen",
-            "type": "tile",
-            "id_range_begin": 3000,
-            "id_range_end": 3000,
-            "comment": "TOYOTA special software keyboard"
-        },
-        {
-            "name": "Application Popup Layer",
-            "role": "popup*",
-            "type": "stack",
-            "id_range_begin": 4000,
-            "id_range_end": 4999,
-            "comment": "[T.B.D]This layer is for application popup layer"
-        },
-        {
-            "name": "Restriction",
-            "role": "restriction",
-            "type": "stack",
-            "id_range_begin": 5000,
-            "id_range_end": 5999,
-            "comment": "This layer is for restriction notification. This is used by restriction role"
-        },
-        {
-            "name": "OnScreen",
-            "role": "^on_screen*",
-            "type": "stack",
-            "id_range_begin": 6000,
-            "id_range_end": 6999,
-            "comment": "Range of IDs that will always be placed on the OnScreen layer, that gets a very high 'dummy' id of 9999"
-        },
-        {
-            "name": "Remote",
-            "role": "tbtnavi",
-            "type": "stack",
-            "id_range_begin": 9000,
-            "id_range_end": 9999,
-            "comment": "Range of IDs that will always be placed on the OnScreen layer, that gets a very high 'dummy' id of 9999"
-        }
-    ]
-}
diff --git a/protocol/ivi-wm.xml b/protocol/ivi-wm.xml
deleted file mode 100644
index da45c7e..0000000
--- a/protocol/ivi-wm.xml
+++ /dev/null
@@ -1,608 +0,0 @@
-<?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>
-
diff --git a/src/controller_hooks.hpp b/src/controller_hooks.hpp
deleted file mode 100644
index ae88187..0000000
--- a/src/controller_hooks.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef TMCAGLWM_CONTROLLER_HOOKS_HPP
-#define TMCAGLWM_CONTROLLER_HOOKS_HPP
-
-#include <cstdint>
-
-#include <functional>
-
-namespace wm
-{
-
-class WindowManager;
-
-struct controller_hooks
-{
-    WindowManager *wmgr;
-
-    void surface_created(uint32_t surface_id);
-    void surface_removed(uint32_t surface_id);
-    void surface_visibility(uint32_t surface_id, uint32_t v);
-    void surface_destination_rectangle(uint32_t surface_id, uint32_t x, uint32_t y, uint32_t w, uint32_t h);
-    void surface_properties(uint32_t surface_id, uint32_t pid);
-};
-
-} // namespace wm
-
-#endif // TMCAGLWM_CONTROLLER_HOOKS_HPP
diff --git a/src/layers.cpp b/src/layers.cpp
deleted file mode 100644
index 05d404d..0000000
--- a/src/layers.cpp
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * 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 <regex>
-
-#include "layers.hpp"
-#include "json_helper.hpp"
-#include "util.hpp"
-
-namespace wm
-{
-
-using json = nlohmann::json;
-
-layer::layer(nlohmann::json const &j)
-{
-    this->role = j["role"];
-    this->name = j["name"];
-    this->layer_id = j["layer_id"];
-
-    // Init flag of normal layout only
-    this->is_normal_layout_only = true;
-
-    auto split_layouts = j.find("split_layouts");
-    if (split_layouts != j.end())
-    {
-
-        // Clear flag of normal layout only
-        this->is_normal_layout_only = false;
-
-        auto &sls = j["split_layouts"];
-        // this->layouts.reserve(sls.size());
-        std::transform(std::cbegin(sls), std::cend(sls),
-                       std::back_inserter(this->layouts), [this](json const &sl) {
-                           struct split_layout l
-                           {
-                               sl["name"], sl["main_match"], sl["sub_match"]
-                           };
-                           HMI_DEBUG("wm",
-                                     "layer %d add split_layout \"%s\" (main: \"%s\") (sub: "
-                                     "\"%s\")",
-                                     this->layer_id,
-                                     l.name.c_str(), l.main_match.c_str(),
-                                     l.sub_match.c_str());
-                           return l;
-                       });
-    }
-    HMI_DEBUG("layer_id:%d is_normal_layout_only:%d\n",
-              this->layer_id, this->is_normal_layout_only);
-}
-
-struct result<struct layer_map> to_layer_map(nlohmann::json const &j)
-{
-    try
-    {
-        layer_map stl{};
-        auto m = j["mappings"];
-
-        std::transform(std::cbegin(m), std::cend(m),
-                       std::inserter(stl.mapping, stl.mapping.end()),
-                       [](nlohmann::json const &j) {
-                           return std::pair<int, struct layer>(
-                               j.value("layer_id", -1), layer(j));
-                       });
-
-        // TODO: add sanity checks here?
-        // * check for double IDs
-        // * check for double names/roles
-
-        stl.layers.reserve(m.size());
-        std::transform(std::cbegin(stl.mapping), std::cend(stl.mapping),
-                       std::back_inserter(stl.layers),
-                       [&stl](std::pair<int, struct layer> const &k) {
-                           stl.roles.emplace_back(
-                               std::make_pair(k.second.role, k.second.layer_id));
-                           return unsigned(k.second.layer_id);
-                       });
-
-        std::sort(stl.layers.begin(), stl.layers.end());
-
-        for (auto i : stl.mapping)
-        {
-            if (i.second.name.empty())
-            {
-                return Err<struct layer_map>("Found mapping w/o name");
-            }
-            if (i.second.layer_id == -1)
-            {
-                return Err<struct layer_map>("Found invalid/unset IDs in mapping");
-            }
-        }
-
-        auto msi = j.find("main_surface");
-        if (msi != j.end())
-        {
-            stl.main_surface_name = msi->value("surface_role", "");
-            stl.main_surface = -1;
-        }
-
-        return Ok(stl);
-    }
-    catch (std::exception &e)
-    {
-        return Err<struct layer_map>(e.what());
-    }
-}
-
-optional<int>
-layer_map::get_layer_id(int surface_id)
-{
-    auto i = this->surfaces.find(surface_id);
-    if (i != this->surfaces.end())
-    {
-        return optional<int>(i->second);
-    }
-    return nullopt;
-}
-
-optional<int> layer_map::get_layer_id(std::string const &role)
-{
-    for (auto const &r : this->roles)
-    {
-        auto re = std::regex(r.first);
-        if (std::regex_match(role, re))
-        {
-            HMI_DEBUG("role %s matches layer %d", role.c_str(), r.second);
-            return optional<int>(r.second);
-        }
-    }
-    HMI_DEBUG("role %s does NOT match any layer", role.c_str());
-    return nullopt;
-}
-
-json layer::to_json() const
-{
-    auto is_full = this->rect == compositor::full_rect;
-
-    json r{};
-    if (is_full)
-    {
-        r = {{"type", "full"}};
-    }
-    else
-    {
-        r = {{"type", "rect"},
-             {"rect",
-              {{"x", this->rect.x},
-               {"y", this->rect.y},
-               {"width", this->rect.w},
-               {"height", this->rect.h}}}};
-    }
-
-    return {
-        {"name", this->name},
-        {"role", this->role},
-        {"layer_id", this->layer_id},
-        {"area", r},
-    };
-}
-
-json layer_map::to_json() const
-{
-    json j{};
-    for (auto const &i : this->mapping)
-    {
-        j.push_back(i.second.to_json());
-    }
-    return j;
-}
-
-void layer_map::setupArea(double scaling)
-{
-    compositor::rect rct;
-
-    rct = this->area2size["normal.full"];
-    this->area2size["normalfull"] = rct;
-    this->area2size["normal"] = rct;
-
-    for (auto &i : this->area2size)
-    {
-        i.second.x = static_cast<int>(scaling * i.second.x + 0.5);
-        i.second.y = static_cast<int>(scaling * i.second.y + 0.5);
-        i.second.w = static_cast<int>(scaling * i.second.w + 0.5);
-        i.second.h = static_cast<int>(scaling * i.second.h + 0.5);
-
-        HMI_DEBUG("wm:lm", "area:%s size(after) : x:%d y:%d w:%d h:%d",
-            i.first.c_str(), i.second.x, i.second.y, i.second.w, i.second.h);
-    }
-}
-
-compositor::rect layer_map::getAreaSize(const std::string &area)
-{
-    return area2size[area];
-}
-
-int layer_map::loadAreaDb()
-{
-    HMI_DEBUG("wm:lm", "Call");
-
-    // Get afm application installed dir
-    char const *afm_app_install_dir = getenv("AFM_APP_INSTALL_DIR");
-    HMI_DEBUG("wm:lm", "afm_app_install_dir:%s", afm_app_install_dir);
-
-    std::string file_name;
-    if (!afm_app_install_dir)
-    {
-        HMI_ERROR("wm:lm", "AFM_APP_INSTALL_DIR is not defined");
-    }
-    else
-    {
-        file_name = std::string(afm_app_install_dir) + std::string("/etc/areas.db");
-    }
-
-    // Load area.db
-    json_object *json_obj;
-    int ret = jh::inputJsonFilie(file_name.c_str(), &json_obj);
-    if (0 > ret)
-    {
-        HMI_DEBUG("wm:lm", "Could not open area.db, so use default area information");
-        json_obj = json_tokener_parse(kDefaultAreaDb);
-    }
-    HMI_DEBUG("wm:lm", "json_obj dump:%s", json_object_get_string(json_obj));
-
-    // Perse areas
-    HMI_DEBUG("wm:lm", "Perse areas");
-    json_object *json_cfg;
-    if (!json_object_object_get_ex(json_obj, "areas", &json_cfg))
-    {
-        HMI_ERROR("wm:lm", "Parse Error!!");
-        return -1;
-    }
-
-    int len = json_object_array_length(json_cfg);
-    HMI_DEBUG("wm:lm", "json_cfg len:%d", len);
-    HMI_DEBUG("wm:lm", "json_cfg dump:%s", json_object_get_string(json_cfg));
-
-    const char *area;
-    for (int i = 0; i < len; i++)
-    {
-        json_object *json_tmp = json_object_array_get_idx(json_cfg, i);
-        HMI_DEBUG("wm:lm", "> json_tmp dump:%s", json_object_get_string(json_tmp));
-
-        area = jh::getStringFromJson(json_tmp, "name");
-        if (nullptr == area)
-        {
-            HMI_ERROR("wm:lm", "Parse Error!!");
-            return -1;
-        }
-        HMI_DEBUG("wm:lm", "> area:%s", area);
-
-        json_object *json_rect;
-        if (!json_object_object_get_ex(json_tmp, "rect", &json_rect))
-        {
-            HMI_ERROR("wm:lm", "Parse Error!!");
-            return -1;
-        }
-        HMI_DEBUG("wm:lm", "> json_rect dump:%s", json_object_get_string(json_rect));
-
-        compositor::rect area_size;
-        area_size.x = jh::getIntFromJson(json_rect, "x");
-        area_size.y = jh::getIntFromJson(json_rect, "y");
-        area_size.w = jh::getIntFromJson(json_rect, "w");
-        area_size.h = jh::getIntFromJson(json_rect, "h");
-
-        this->area2size[area] = area_size;
-    }
-
-    // Check
-    for (auto itr = this->area2size.begin();
-         itr != this->area2size.end(); ++itr)
-    {
-        HMI_DEBUG("wm:lm", "area:%s x:%d y:%d w:%d h:%d",
-                  itr->first.c_str(), itr->second.x, itr->second.y,
-                  itr->second.w, itr->second.h);
-    }
-
-    // Release json_object
-    json_object_put(json_obj);
-
-    return 0;
-}
-
-const char* layer_map::kDefaultAreaDb = "{ \
-    \"areas\": [ \
-        { \
-            \"name\": \"fullscreen\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 0, \
-                \"w\": 1080, \
-                \"h\": 1920 \
-            } \
-        }, \
-        { \
-            \"name\": \"normal.full\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 218, \
-                \"w\": 1080, \
-                \"h\": 1488 \
-            } \
-        }, \
-        { \
-            \"name\": \"split.main\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 218, \
-                \"w\": 1080, \
-                \"h\": 744 \
-            } \
-        }, \
-        { \
-            \"name\": \"split.sub\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 962, \
-                \"w\": 1080, \
-                \"h\": 744 \
-            } \
-        }, \
-        { \
-            \"name\": \"software_keyboard\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 962, \
-                \"w\": 1080, \
-                \"h\": 744 \
-            } \
-        }, \
-        { \
-            \"name\": \"restriction.normal\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 218, \
-                \"w\": 1080, \
-                \"h\": 1488 \
-            } \
-        }, \
-        { \
-            \"name\": \"restriction.split.main\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 218, \
-                \"w\": 1080, \
-                \"h\": 744 \
-            } \
-        }, \
-        { \
-            \"name\": \"restriction.split.sub\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 962, \
-                \"w\": 1080, \
-                \"h\": 744 \
-            } \
-        }, \
-        { \
-            \"name\": \"on_screen\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 218, \
-                \"w\": 1080, \
-                \"h\": 1488 \
-            } \
-        } \
-    ] \
-}";
-
-} // namespace wm
diff --git a/src/layers.hpp b/src/layers.hpp
deleted file mode 100644
index f52886e..0000000
--- a/src/layers.hpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef TMCAGLWM_LAYERS_H
-#define TMCAGLWM_LAYERS_H
-
-#include <string>
-
-#include "../include/json.hpp"
-#include "layout.hpp"
-#include "result.hpp"
-#include "wayland_ivi_wm.hpp"
-
-namespace wm
-{
-
-struct split_layout
-{
-    std::string name;
-    std::string main_match;
-    std::string sub_match;
-};
-
-struct layer
-{
-    using json = nlohmann::json;
-
-    // A more or less descriptive name?
-    std::string name = "";
-    // The actual layer ID
-    int layer_id = -1;
-    // The rectangular region surfaces are allowed to draw on
-    // this layer, note however, width and hieght of the rect
-    // can be negative, in which case they specify that
-    // the actual value is computed using MAX + 1 - w
-    // That is; allow us to specify dimensions dependent on
-    // e.g. screen dimension, w/o knowing the actual screen size.
-    compositor::rect rect;
-    // Specify a role prefix for surfaces that should be
-    // put on this layer.
-    std::string role;
-    // TODO: perhaps a zorder is needed here?
-    std::vector<struct split_layout> layouts;
-
-    mutable struct LayoutState state;
-
-    // Flag of normal layout only
-    bool is_normal_layout_only;
-
-    explicit layer(nlohmann::json const &j);
-
-    json to_json() const;
-};
-
-struct layer_map
-{
-    using json = nlohmann::json;
-
-    using storage_type = std::map<int, struct layer>;
-    using layers_type = std::vector<uint32_t>;
-    using role_to_layer_map = std::vector<std::pair<std::string, int>>;
-    using addsurf_layer_map = std::map<int, int>;
-
-    storage_type mapping; // map surface_id to layer
-    layers_type layers;   // the actual layer IDs we have
-    int main_surface;
-    std::string main_surface_name;
-    role_to_layer_map roles;
-    addsurf_layer_map surfaces; // additional surfaces on layers
-
-    optional<int> get_layer_id(int surface_id);
-    optional<int> get_layer_id(std::string const &role);
-    optional<struct LayoutState *> get_layout_state(int surface_id)
-    {
-        int layer_id = *this->get_layer_id(surface_id);
-        auto i = this->mapping.find(layer_id);
-        return i == this->mapping.end()
-                   ? nullopt
-                   : optional<struct LayoutState *>(&i->second.state);
-    }
-    optional<struct layer> get_layer(int layer_id)
-    {
-        auto i = this->mapping.find(layer_id);
-        return i == this->mapping.end() ? nullopt
-                                        : optional<struct layer>(i->second);
-    }
-
-    layers_type::size_type get_layers_count() const
-    {
-        return this->layers.size();
-    }
-
-    void add_surface(int surface_id, int layer_id)
-    {
-        this->surfaces[surface_id] = layer_id;
-    }
-
-    void remove_surface(int surface_id)
-    {
-        this->surfaces.erase(surface_id);
-    }
-
-    json to_json() const;
-    void setupArea(double scaling);
-    compositor::rect getAreaSize(const std::string &area);
-    int loadAreaDb();
-
-  private:
-    std::unordered_map<std::string, compositor::rect> area2size;
-
-    static const char *kDefaultAreaDb;
-};
-
-struct result<struct layer_map> to_layer_map(nlohmann::json const &j);
-
-static const nlohmann::json default_layers_json = {
-   {"main_surface", {
-      {"surface_role", "HomeScreen"}
-   }},
-   {"mappings", {
-      {
-         {"role", "^HomeScreen$"},
-         {"name", "HomeScreen"},
-         {"layer_id", 1000},
-         {"area", {
-            {"type", "full"}
-         }}
-      },
-      {
-         {"role", "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}
-            }}
-         }}
-      },
-      {
-         {"role", "^OnScreen.*"},
-         {"name", "popups"},
-         {"layer_id", 9999},
-         {"area", {
-            {"type", "rect"},
-            {"rect", {
-               {"x", 0},
-               {"y", 760},
-               {"width", -1},
-               {"height", 400}
-            }}
-         }}
-      }
-   }}
-};
-} // namespace wm
-
-#endif // TMCAGLWM_LAYERS_H
diff --git a/src/wayland_ivi_wm.cpp b/src/wayland_ivi_wm.cpp
deleted file mode 100644
index 28bd024..0000000
--- a/src/wayland_ivi_wm.cpp
+++ /dev/null
@@ -1,724 +0,0 @@
-/*
- * 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 "wayland_ivi_wm.hpp"
-
-/**
- * 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()
-{
-    ;
-    while (wl_display_prepare_read(this->d.get()) == -1)
-    {
-        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(), &registry_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("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->physical_width = pw;
-    this->physical_height = ph;
-    this->transform = tx;
-}
-
-void output::mode(uint32_t flags, int32_t w, int32_t h, int32_t r)
-{
-    HMI_DEBUG("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("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);
-        std::swap(this->physical_width, this->physical_height);
-    }
-}
-
-void output::scale(int32_t factor)
-{
-    HMI_DEBUG("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 c = static_cast<struct controller *>(data);
-    c->surface_visibility_changed(surface_id, visibility);
-}
-
-void surface_opacity_changed(void *data, struct ivi_wm * /*ivi_wm*/,
-                             uint32_t surface_id, wl_fixed_t opacity)
-{
-    auto c = static_cast<struct controller *>(data);
-    c->surface_opacity_changed(surface_id, 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 c = static_cast<struct controller *>(data);
-    c->surface_source_rectangle_changed(surface_id, 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 c = static_cast<struct controller *>(data);
-    c->surface_destination_rectangle_changed(surface_id, 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 c = static_cast<struct controller *>(data);
-    c->surface_destroyed(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 c = static_cast<struct controller *>(data);
-    c->surface_size_changed(surface_id, 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 c = static_cast<struct controller *>(data);
-    c->surface_stats_received(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 c = static_cast<struct controller *>(data);
-    c->surface_added_to_layer(layer_id, surface_id);
-}
-
-void layer_visibility_changed(void *data, struct ivi_wm * /*ivi_wm*/,
-                              uint32_t layer_id, int32_t visibility)
-{
-    auto c = static_cast<struct controller *>(data);
-    c->layer_visibility_changed(layer_id, visibility);
-}
-
-void layer_opacity_changed(void *data, struct ivi_wm * /*ivi_wm*/,
-                           uint32_t layer_id, wl_fixed_t opacity)
-{
-    auto c = static_cast<struct controller *>(data);
-    c->layer_opacity_changed(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 c = static_cast<struct controller *>(data);
-    c->layer_source_rectangle_changed(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 c = static_cast<struct controller *>(data);
-    c->layer_destination_rectangle_changed(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 c = static_cast<struct controller *>(data);
-    c->layer_destroyed(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("added layer_id:%d", layer_id);
-}
-
-void connector_name(void *data,
-                    struct ivi_wm_screen *ivi_wm_screen,
-                    const char *process_name)
-{
-    HMI_DEBUG("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("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("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("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("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("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::get_surface_properties(uint32_t surface_id, int param)
-{
-    ivi_wm_surface_get(this->proxy.get(), surface_id, param);
-}
-
-void controller::layer_created(uint32_t id)
-{
-    HMI_DEBUG("compositor::controller @ %p layer %u (%x)", this->proxy.get(), id, id);
-    if (this->layers.find(id) != this->layers.end())
-    {
-        HMI_DEBUG("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("compositor::controller @ %p error o %d c %d text %s",
-              this->proxy.get(), object_id, error_code, error_text);
-}
-
-void controller::surface_visibility_changed(uint32_t id, int32_t visibility)
-{
-    HMI_DEBUG("compositor::surface %s @ %d v %i", __func__, id,
-              visibility);
-    this->sprops[id].visibility = visibility;
-    this->chooks->surface_visibility(id, visibility);
-}
-
-void controller::surface_opacity_changed(uint32_t id, float opacity)
-{
-    HMI_DEBUG("compositor::surface %s @ %d o %f",
-                __func__, id, opacity);
-    this->sprops[id].opacity = opacity;
-}
-
-void controller::surface_source_rectangle_changed(uint32_t id, int32_t x,
-                                                  int32_t y, int32_t width,
-                                                  int32_t height)
-{
-    HMI_DEBUG("compositor::surface %s @ %d x %i y %i w %i h %i", __func__,
-              id, x, y, width, height);
-    this->sprops[id].src_rect = rect{width, height, x, y};
-}
-
-void controller::surface_destination_rectangle_changed(uint32_t id, int32_t x,
-                                                       int32_t y, int32_t width,
-                                                       int32_t height)
-{
-    HMI_DEBUG("compositor::surface %s @ %d x %i y %i w %i h %i", __func__,
-              id, x, y, width, height);
-    this->sprops[id].dst_rect = rect{width, height, x, y};
-    this->chooks->surface_destination_rectangle(id, x, y, width, height);
-}
-
-void controller::surface_size_changed(uint32_t id, int32_t width,
-                                      int32_t height)
-{
-    HMI_DEBUG("compositor::surface %s @ %d w %i h %i", __func__, id,
-              width, height);
-    this->sprops[id].size = size{uint32_t(width), uint32_t(height)};
-    this->surfaces[id]->set_source_rectangle(0, 0, width, height);
-}
-
-void controller::surface_added_to_layer(uint32_t layer_id, uint32_t surface_id)
-{
-    HMI_DEBUG("compositor::surface %s @ %d l %u",
-              __func__, layer_id, surface_id);
-}
-
-void controller::surface_stats_received(uint32_t surface_id,
-                                        uint32_t frame_count, uint32_t pid)
-{
-    HMI_DEBUG("compositor::surface %s @ %d f %u pid %u",
-              __func__, surface_id, frame_count, pid);
-    this->sprops[surface_id].pid = pid;
-}
-
-void controller::surface_created(uint32_t id)
-{
-    HMI_DEBUG("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);
-
-        // 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);
-
-        // Flush display
-        this->display->flush();
-    }
-}
-
-void controller::surface_destroyed(uint32_t surface_id)
-{
-    HMI_DEBUG("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("compositor::controller @ %p error o %d c %d text %s",
-              this->proxy.get(), object_id, error_code, error_text);
-}
-
-void controller::layer_visibility_changed(uint32_t layer_id, int32_t visibility)
-{
-    HMI_DEBUG("compositor::layer %s @ %d v %i", __func__, layer_id, visibility);
-    this->lprops[layer_id].visibility = visibility;
-}
-
-void controller::layer_opacity_changed(uint32_t layer_id, float opacity)
-{
-    HMI_DEBUG("compositor::layer %s @ %d o %f", __func__, layer_id, opacity);
-    this->lprops[layer_id].opacity = opacity;
-}
-
-void controller::layer_source_rectangle_changed(uint32_t layer_id,
-                                                int32_t x, int32_t y,
-                                                int32_t width, int32_t height)
-{
-    HMI_DEBUG("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(uint32_t layer_id,
-                                                     int32_t x, int32_t y,
-                                                     int32_t width, int32_t height)
-{
-    HMI_DEBUG("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_destroyed(uint32_t layer_id)
-{
-    HMI_DEBUG("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("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("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("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("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("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("Remove screen proxy mapping for %p", p);
-    this->screen_proxy_to_id.erase(uintptr_t(p));
-}
-
-} // namespace compositor
diff --git a/src/wayland_ivi_wm.hpp b/src/wayland_ivi_wm.hpp
deleted file mode 100644
index d8915a1..0000000
--- a/src/wayland_ivi_wm.hpp
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef WM_WAYLAND_HPP
-#define WM_WAYLAND_HPP
-
-#include "controller_hooks.hpp"
-#include "ivi-wm-client-protocol.h"
-#include "util.hpp"
-
-#include <functional>
-#include <memory>
-#include <unordered_map>
-#include <vector>
-
-/**
- * @struct wayland_proxy
- */
-template <typename ProxyT>
-struct wayland_proxy
-{
-    std::unique_ptr<ProxyT, std::function<void(ProxyT *)>> proxy;
-    wayland_proxy(wayland_proxy const &) = delete;
-    wayland_proxy &operator=(wayland_proxy const &) = delete;
-    wayland_proxy(void *p)
-        : wayland_proxy(p,
-                        reinterpret_cast<void (*)(ProxyT *)>(wl_proxy_destroy)) {}
-    wayland_proxy(void *p, std::function<void(ProxyT *)> &&p_del)
-        : proxy(std::unique_ptr<ProxyT, std::function<void(ProxyT *)>>(
-              static_cast<ProxyT *>(p), p_del)) {}
-};
-
-/**
- * namespace wl
- */
-namespace wl
-{
-
-/**
- * @struct registry
- */
-struct registry : public wayland_proxy<struct wl_registry>
-{
-    typedef std::function<void(struct wl_registry *, uint32_t, uint32_t)> binder;
-    std::unordered_map<std::string, binder> bindings;
-
-    registry(registry const &) = delete;
-    registry &operator=(registry const &) = delete;
-    registry(struct wl_display *d);
-
-    void add_global_handler(char const *iface, binder bind);
-
-    // Events
-    void global_created(uint32_t name, char const *iface, uint32_t v);
-    void global_removed(uint32_t name);
-};
-
-/**
- * @struct display
- */
-struct display
-{
-    std::unique_ptr<struct wl_display, void (*)(struct wl_display *)> d;
-    struct registry r;
-
-    display(display const &) = delete;
-    display &operator=(display const &) = delete;
-    display();
-    bool ok() const;
-    void roundtrip();
-    int dispatch();
-    int dispatch_pending();
-    int read_events();
-    void flush();
-    int get_fd() const;
-    int get_error();
-
-    // Lets just proxy this for the registry
-    inline void add_global_handler(char const *iface, registry::binder bind)
-    {
-        this->r.add_global_handler(iface, bind);
-    }
-};
-
-/**
- * @struct output
- */
-struct output : public wayland_proxy<struct wl_output>
-{
-    int width{};
-    int height{};
-    int physical_width{};
-    int physical_height{};
-    int refresh{};
-    int transform{};
-
-    output(output const &) = delete;
-    output &operator=(output const &) = delete;
-    output(struct wl_registry *r, uint32_t name, uint32_t v);
-
-    // Events
-    void 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);
-    void mode(uint32_t flags, int32_t w, int32_t h, int32_t r);
-    void done();
-    void scale(int32_t factor);
-};
-} // namespace wl
-
-/**
- * namespace compositor
- */
-namespace compositor
-{
-
-struct size
-{
-    uint32_t w, h;
-};
-
-struct rect
-{
-    int32_t w, h;
-    int32_t x, y;
-};
-
-static const constexpr rect full_rect = rect{-1, -1, 0, 0};
-
-inline bool operator==(struct rect a, struct rect b)
-{
-    return a.w == b.w && a.h == b.h && a.x == b.x && a.y == b.y;
-}
-
-struct controller;
-
-struct controller_child
-{
-    struct controller *parent;
-    uint32_t id;
-
-    controller_child(controller_child const &) = delete;
-    controller_child &operator=(controller_child const &) = delete;
-    controller_child(struct controller *c, uint32_t i) : parent(c), id(i) {}
-    virtual ~controller_child() {}
-};
-
-struct surface_properties
-{
-    uint32_t id; // let's just save an ID here too
-    struct rect dst_rect;
-    struct rect src_rect;
-    struct size size;
-    int32_t orientation;
-    int32_t visibility;
-    float opacity;
-    uint32_t pid;
-};
-
-/**
- * @struct surface
- */
-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_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 controller_child
-{
-    layer(layer const &) = delete;
-    layer &operator=(layer const &) = delete;
-    layer(uint32_t i, struct controller *c);
-    layer(uint32_t i, int32_t w, int32_t h, struct controller *c);
-
-    // Requests
-    void set_visibility(uint32_t visibility);
-    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_wm_screen>,
-                public controller_child
-{
-    screen(screen const &) = delete;
-    screen &operator=(screen const &) = delete;
-    screen(uint32_t i, struct controller *c, struct wl_output *o);
-
-    void clear();
-    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_wm>
-{
-    // This controller is still missing ivi-input
-
-    typedef std::unordered_map<uintptr_t, uint32_t> proxy_to_id_map_type;
-    typedef std::unordered_map<uint32_t, std::unique_ptr<struct surface>>
-        surface_map_type;
-    typedef std::unordered_map<uint32_t, std::unique_ptr<struct layer>>
-        layer_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:
-    // The order of these member is mandatory, as when objects are destroyed
-    // they will call their parent (that's us right here!) and remove their
-    // proxy-to-id mapping. I.e. the *_proxy_to_id members need to be valid
-    // when the surfaces/layers/screens maps are destroyed. This sucks, but
-    // I cannot see a better solution w/o globals or some other horrible
-    // call-our-parent construct.
-    proxy_to_id_map_type surface_proxy_to_id;
-    proxy_to_id_map_type layer_proxy_to_id;
-    proxy_to_id_map_type screen_proxy_to_id;
-
-    props_map sprops;
-    props_map lprops;
-
-    surface_map_type surfaces;
-    layer_map_type layers;
-    screen_map_type screens;
-
-    std::unique_ptr<struct screen> screen;
-
-    size output_size;   // Display size[pixel]
-    size physical_size; // Display size[mm]
-
-    // Scale for conversion CSS PX -> DP(Device Pixel)
-    double scale;
-
-    wm::controller_hooks *chooks;
-
-    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 wl_output *p, uint32_t id);
-    void remove_proxy_to_id_mapping(struct wl_output *p);
-
-    bool surface_exists(uint32_t id) const
-    {
-        return this->surfaces.find(id) != this->surfaces.end();
-    }
-
-    bool layer_exists(uint32_t id) const
-    {
-        return this->layers.find(id) != this->layers.end();
-    }
-
-    controller(struct wl_registry *r, uint32_t name, uint32_t version);
-
-    // Requests
-    void commit_changes() const
-    {
-        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);
-    void get_surface_properties(uint32_t surface_id, int param = 0);
-
-    // Events
-    void surface_visibility_changed(uint32_t id, int32_t visibility);
-    void surface_opacity_changed(uint32_t id, float opacity);
-    void surface_source_rectangle_changed(uint32_t id, int32_t x, int32_t y,
-                                          int32_t width, int32_t height);
-    void surface_destination_rectangle_changed(uint32_t id, int32_t x, int32_t y,
-                                               int32_t width, int32_t height);
-    void surface_created(uint32_t id);
-    void surface_destroyed(uint32_t surface_id);
-    void surface_error_detected(uint32_t object_id,
-                                uint32_t error_code, char const *error_text);
-    void surface_size_changed(uint32_t id, int32_t width, int32_t height);
-    void surface_stats_received(uint32_t surface_id,
-                                uint32_t frame_count, uint32_t pid);
-    void surface_added_to_layer(uint32_t layer_id, uint32_t surface_id);
-
-    void layer_visibility_changed(uint32_t layer_id, int32_t visibility);
-    void layer_opacity_changed(uint32_t layer_id, float opacity);
-    void layer_source_rectangle_changed(uint32_t layer_id, int32_t x, int32_t y,
-                                        int32_t width, int32_t height);
-    void layer_destination_rectangle_changed(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(uint32_t layer_id);
-    void layer_error_detected(uint32_t object_id,
-                              uint32_t error_code, char const *error_text);
-};
-} // namespace compositor
-
-#endif // !WM_WAYLAND_HPP