Change the protocol from ivi-controller to ivi-wm

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>

10 files changed, 724 insertions, 878 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c55fe0b..cc3efc3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-wlproto(IVI_CON ivi-controller)
+wlproto(IVI_CON ivi-wm)
 
 include(FindPkgConfig)
 pkg_check_modules(AFB REQUIRED afb-daemon)
@@ -27,8 +27,8 @@ set(TARGETS_WM windowmanager-service)
 
 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
diff --git a/src/app.cpp b/src/app.cpp
index 254214e..f99b7db 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -19,7 +19,7 @@
 #include "layers.hpp"
 #include "layout.hpp"
 #include "util.hpp"
-#include "wayland.hpp"
+#include "wayland_ivi_wm.hpp"
 
 #include <cstdio>
 #include <memory>
@@ -120,7 +120,7 @@ int App::init() {
       });
 
    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);
 
@@ -132,6 +132,12 @@ int App::init() {
             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
@@ -144,22 +150,6 @@ int App::init() {
    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();
@@ -290,10 +280,6 @@ void App::surface_set_layout(int surface_id, optional<int> sub_surface_id) {
       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);
 
@@ -302,11 +288,6 @@ void App::surface_set_layout(int surface_id, optional<int> sub_surface_id) {
    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);
 
@@ -382,14 +363,6 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw
             // 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);
@@ -423,15 +396,9 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw
                   }
                   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());
@@ -458,14 +425,6 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw
                   // 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);
@@ -626,8 +585,7 @@ void App::surface_created(uint32_t surface_id) {
 
    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)) {
@@ -733,8 +691,7 @@ char const *App::api_request_surface(char const *drawing_name,
    // 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;
@@ -759,13 +716,11 @@ void App::activate(int id) {
 
                // 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);
@@ -783,7 +738,7 @@ void App::activate(int id) {
 
 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();
 
@@ -798,13 +753,11 @@ void App::deactivate(int id) {
 
          // 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);
diff --git a/src/app.hpp b/src/app.hpp
index 5ec19ae..7fccde3 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -30,7 +30,7 @@
 #include "layout.hpp"
 #include "policy.hpp"
 #include "result.hpp"
-#include "wayland.hpp"
+#include "wayland_ivi_wm.hpp"
 #include "hmi-debug.h"
 
 namespace wl {
@@ -180,7 +180,6 @@ struct App {
 
    int init();
 
-   int dispatch_events();
    int dispatch_pending_events();
 
    void set_pending_events();
diff --git a/src/json_helper.hpp b/src/json_helper.hpp
index 687fd89..78e03f7 100644
--- a/src/json_helper.hpp
+++ b/src/json_helper.hpp
@@ -18,7 +18,7 @@
 #define TMCAGLWM_JSON_HELPER_HPP
 
 #include "result.hpp"
-#include "wayland.hpp"
+#include "wayland_ivi_wm.hpp"
 #include <json.hpp>
 
 struct json_object;
diff --git a/src/layers.hpp b/src/layers.hpp
index 1942229..43b1071 100644
--- a/src/layers.hpp
+++ b/src/layers.hpp
@@ -25,7 +25,7 @@
 
 #include "layout.hpp"
 #include "result.hpp"
-#include "wayland.hpp"
+#include "wayland_ivi_wm.hpp"
 
 namespace wm {
 
diff --git a/src/layout.hpp b/src/layout.hpp
index b6b209f..d5fd00c 100644
--- a/src/layout.hpp
+++ b/src/layout.hpp
@@ -21,7 +21,6 @@
 #include <string>
 
 #include "result.hpp"
-#include "wayland.hpp"
 
 namespace wm {
 
diff --git a/src/main.cpp b/src/main.cpp
index 0197c3c..8e252d4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,7 +23,7 @@
 #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>
diff --git a/src/wayland.cpp b/src/wayland.cpp
deleted file mode 100644
index 53668d2..0000000
--- a/src/wayland.cpp
+++ /dev/null
@@ -1,734 +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 <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(), &registry_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
diff --git a/src/wayland_ivi_wm.cpp b/src/wayland_ivi_wm.cpp
new file mode 100644
index 0000000..2937487
--- /dev/null
+++ b/src/wayland_ivi_wm.cpp
@@ -0,0 +1,647 @@
+/*
+ * 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(), &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("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
diff --git a/src/wayland.hpp b/src/wayland_ivi_wm.hpp
index 59d7ade..a51a1a0 100644
--- a/src/wayland.hpp
+++ b/src/wayland_ivi_wm.hpp
@@ -18,7 +18,7 @@
 #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>
@@ -61,8 +61,8 @@ struct registry : public wayland_proxy<struct wl_registry> {
    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);
 };
 
 /**
@@ -93,7 +93,7 @@ struct display {
 /**
  * @struct output
  */
-struct output : wayland_proxy<struct wl_output> {
+struct output : public wayland_proxy<struct wl_output> {
    int width{};
    int height{};
    int refresh{};
@@ -157,31 +157,23 @@ struct surface_properties {
 /**
  * @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);
@@ -189,37 +181,30 @@ struct layer : public wayland_proxy<struct ivi_controller_layer>,
 
    // 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;
@@ -227,9 +212,7 @@ struct controller : public wayland_proxy<struct ivi_controller> {
       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:
@@ -250,16 +233,20 @@ struct controller : public wayland_proxy<struct ivi_controller> {
    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);
 
@@ -275,47 +262,42 @@ struct controller : public wayland_proxy<struct ivi_controller> {
 
    // 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