6 files changed, 150 insertions, 14 deletions

diff --git a/src/afb_binding_api.cpp b/src/afb_binding_api.cpp
index 3c75524..825bc99 100644
--- a/src/afb_binding_api.cpp
+++ b/src/afb_binding_api.cpp
@@ -69,6 +69,23 @@ binding_api::result_type binding_api::enddraw(char const* drawing_name) {
    return Ok(json_object_new_object());
 }
 
+binding_api::result_type binding_api::getdisplayinfo() {
+   auto r = this->app->api_get_display_info();
+   if (r.is_err()) {
+      return Err<json_object *>(r.unwrap_err());
+   }
+   return Ok(r.unwrap());
+}
+
+binding_api::result_type binding_api::getareainfo(
+   char const *drawing_name) {
+   auto r = this->app->api_get_area_info(drawing_name);
+   if (r.is_err()) {
+      return Err<json_object *>(r.unwrap_err());
+   }
+   return Ok(r.unwrap());
+}
+
 binding_api::result_type binding_api::list_drawing_names() {
    HMI_DEBUG("wm", "%s", __func__);
    json j = this->app->id_alloc.name2id;
diff --git a/src/app.cpp b/src/app.cpp
index 307217e..39ccfa8 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -209,6 +209,8 @@ int App::init_layers() {
 
    // Write output dimensions to ivi controller...
    c->output_size = compositor::size{uint32_t(o->width), uint32_t(o->height)};
+   c->physical_size = compositor::size{uint32_t(o->physical_width),
+                                       uint32_t(o->physical_height)};
 
    // Clear scene
    layers.clear();
@@ -299,6 +301,10 @@ void App::surface_set_layout(int surface_id, optional<int> sub_surface_id) {
       // set destination to the display rectangle
       ss->set_destination_rectangle(x + x_off, y + y_off, w, h);
 
+      this->area_info[*sub_surface_id].x = x;
+      this->area_info[*sub_surface_id].y = y;
+      this->area_info[*sub_surface_id].w = w;
+      this->area_info[*sub_surface_id].h = h;
    }
 
    HMI_DEBUG("wm", "surface_set_layout for surface %u on layer %u", surface_id,
@@ -312,6 +318,12 @@ void App::surface_set_layout(int surface_id, optional<int> sub_surface_id) {
    // set destination to the display rectangle
    s->set_destination_rectangle(x, y, w, h);
 
+   // update area information
+   this->area_info[surface_id].x = x;
+   this->area_info[surface_id].y = y;
+   this->area_info[surface_id].w = w;
+   this->area_info[surface_id].h = h;
+
    HMI_DEBUG("wm", "Surface %u now on layer %u with rect { %d, %d, %d, %d }",
             surface_id, layer_id, x, y, w, h);
 }
@@ -393,7 +405,9 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw
             }
 
             std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
-            this->emit_syncdraw(drawing_name, str_area.c_str());
+            compositor::rect area_rect = this->area_info[*surface_id];
+            this->emit_syncdraw(drawing_name, str_area.c_str(),
+                                area_rect.x, area_rect.y, area_rect.w, area_rect.h);
             this->enqueue_flushdraw(state.main);
          });
    } else {
@@ -402,7 +416,9 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw
             state, LayoutState{*surface_id}, [&] (LayoutState const &nl) {
                HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
                std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
-               this->emit_syncdraw(drawing_name, str_area.c_str());
+               compositor::rect area_rect = this->area_info[*surface_id];
+               this->emit_syncdraw(drawing_name, str_area.c_str(),
+                                   area_rect.x, area_rect.y, area_rect.w, area_rect.h);
                this->enqueue_flushdraw(state.main);
             });
       } else {
@@ -425,7 +441,7 @@ 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
@@ -436,8 +452,14 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw
 
                   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());
-                  this->emit_syncdraw(drawing_name, str_area_sub.c_str());
+                  compositor::rect area_rect_main = this->area_info[state.main];
+                  compositor::rect area_rect_sub = this->area_info[*surface_id];
+                  this->emit_syncdraw(main.c_str(), str_area_main.c_str(),
+                                      area_rect_main.x, area_rect_main.y,
+                                      area_rect_main.w, area_rect_main.h);
+                  this->emit_syncdraw(drawing_name, str_area_sub.c_str(),
+                                      area_rect_sub.x, area_rect_sub.y,
+                                      area_rect_sub.w, area_rect_sub.h);
                   this->enqueue_flushdraw(state.main);
                   this->enqueue_flushdraw(state.sub);
                });
@@ -469,7 +491,9 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw
                   }
 
                   std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
-                  this->emit_syncdraw(drawing_name, str_area.c_str());
+                  compositor::rect area_rect = this->area_info[*surface_id];
+                  this->emit_syncdraw(drawing_name, str_area.c_str(),
+                                      area_rect.x, area_rect.y, area_rect.w, area_rect.h);
                   this->enqueue_flushdraw(state.main);
                });
          }
@@ -522,7 +546,9 @@ char const *App::api_deactivate_surface(char const *drawing_name) {
 
                this->layout_commit();
                std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
-               this->emit_syncdraw(sub.c_str(), str_area.c_str());
+               compositor::rect area_rect = this->area_info[state.sub];
+               this->emit_syncdraw(sub.c_str(), str_area.c_str(),
+                                   area_rect.x, area_rect.y, area_rect.w, area_rect.h);
                this->enqueue_flushdraw(state.sub);
             });
       } else {
@@ -543,7 +569,9 @@ char const *App::api_deactivate_surface(char const *drawing_name) {
 
             this->layout_commit();
             std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
-            this->emit_syncdraw(main.c_str(), str_area.c_str());
+            compositor::rect area_rect = this->area_info[state.main];
+            this->emit_syncdraw(main.c_str(), str_area.c_str(),
+                                area_rect.x, area_rect.y, area_rect.w, area_rect.h);
             this->enqueue_flushdraw(state.main);
          });
    } else {
@@ -641,8 +669,8 @@ void App::emit_deactivated(char const *label) {
    this->api.send_event(kListEventName[Event_Inactive], label);
 }
 
-void App::emit_syncdraw(char const *label, char const *area) {
-    this->api.send_event(kListEventName[Event_SyncDraw], label, area);
+void App::emit_syncdraw(char const *label, char const *area, int x, int y, int w, int h) {
+   this->api.send_event(kListEventName[Event_SyncDraw], label, area, x, y, w, h);
 }
 
 void App::emit_flushdraw(char const *label) {
@@ -686,6 +714,64 @@ result<int> App::api_request_surface(char const *drawing_name) {
    return Err<int>("Surface already present");
 }
 
+result<json_object *> App::api_get_display_info() {
+   // Check controller
+   if (!this->controller) {
+      return Err<json_object *>("ivi_controller global not available");
+   }
+
+   // Set display info
+   compositor::size o_size = this->controller->output_size;
+   compositor::size p_size = this->controller->physical_size;
+
+   json_object *object = json_object_new_object();
+   json_object_object_add(object, kKeyWidthPixel,  json_object_new_int(o_size.w));
+   json_object_object_add(object, kKeyHeightPixel, json_object_new_int(o_size.h));
+   json_object_object_add(object, kKeyWidthMm,     json_object_new_int(p_size.w));
+   json_object_object_add(object, kKeyHeightMm,    json_object_new_int(p_size.h));
+
+   return Ok<json_object *>(object);
+}
+
+result<json_object *> App::api_get_area_info(char const *drawing_name) {
+   HMI_DEBUG("wm", "called");
+
+   // Check drawing name, surface/layer id
+   auto const &surface_id = this->lookup_id(drawing_name);
+   if (!surface_id) {
+      return Err<json_object *>("Surface does not exist");
+   }
+
+   if (!this->controller->surface_exists(*surface_id)) {
+      return Err<json_object *>("Surface does not exist in controller!");
+   }
+
+   auto layer_id = this->layers.get_layer_id(*surface_id);
+   if (!layer_id) {
+      return Err<json_object *>("Surface is not on any layer!");
+   }
+
+   auto o_state = *this->layers.get_layout_state(*surface_id);
+   if (o_state == nullptr) {
+      return Err<json_object *>("Could not find layer for surface");
+   }
+
+   struct LayoutState &state = *o_state;
+   if ((state.main != *surface_id) && (state.sub != *surface_id)) {
+      return Err<json_object *>("Surface is inactive");
+   }
+
+   // Set area rectangle
+   compositor::rect area_info = this->area_info[*surface_id];
+   json_object *object = json_object_new_object();
+   json_object_object_add(object, kKeyX,      json_object_new_int(area_info.x));
+   json_object_object_add(object, kKeyY,      json_object_new_int(area_info.y));
+   json_object_object_add(object, kKeyWidth,  json_object_new_int(area_info.w));
+   json_object_object_add(object, kKeyHeight, json_object_new_int(area_info.h));
+
+   return Ok<json_object *>(object);
+}
+
 void App::activate(int id) {
    auto ip = this->controller->sprops.find(id);
    if (ip != this->controller->sprops.end()) {
diff --git a/src/app.hpp b/src/app.hpp
index 413d1c9..11ae8a7 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -57,6 +57,17 @@ static const char *kNameAreaSub = "sub";
 /* Key for json obejct */
 static const char *kKeyDrawingName = "drawing_name";
 static const char *kKeyDrawingArea = "drawing_area";
+static const char *kKeyDrawingRect = "drawing_rect";
+static const char *kKeyX           = "x";
+static const char *kKeyY           = "y";
+static const char *kKeyWidth       = "width";
+static const char *kKeyHeight      = "height";
+static const char *kKeyWidthPixel  = "width_pixel";
+static const char *kKeyHeightPixel = "height_pixel";
+static const char *kKeyWidthMm     = "width_mm";
+static const char *kKeyHeightMm    = "height_mm";
+
+
 
 struct id_allocator {
    unsigned next = 1;
@@ -112,6 +123,9 @@ struct id_allocator {
 };
 
 struct App {
+
+   typedef std::unordered_map<uint32_t, struct compositor::rect> rect_map;
+
    enum EventType {
       Event_Val_Min = 0,
 
@@ -162,6 +176,8 @@ struct App {
 
    std::map<const char *, struct afb_event> map_afb_event;
 
+   rect_map area_info;
+
    explicit App(wl::display *d);
    ~App() = default;
 
@@ -181,6 +197,8 @@ struct App {
    char const *api_activate_surface(char const *drawing_name, char const *drawing_area);
    char const *api_deactivate_surface(char const *drawing_name);
    char const *api_enddraw(char const *drawing_name);
+   result<json_object *> api_get_display_info();
+   result<json_object *> api_get_area_info(char const *drawing_name);
    char const *api_subscribe(afb_req *req, char const *event_name);
    void api_ping();
 
@@ -205,7 +223,7 @@ private:
    // TMC WM Events to clients
    void emit_activated(char const *label);
    void emit_deactivated(char const *label);
-   void emit_syncdraw(char const *label, char const *area);
+   void emit_syncdraw(char const *label, char const *area, int x, int y, int w, int h);
    void emit_flushdraw(char const *label);
    void emit_visible(char const *label, bool is_visible);
    void emit_invisible(char const *label);
diff --git a/src/main.cpp b/src/main.cpp
index c615d3a..395fa62 100755..100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -170,12 +170,21 @@ void binding_api::send_event(char const *evname, char const *label) {
    }
 }
 
-void binding_api::send_event(char const *evname, char const *label, char const *area) {
-   HMI_DEBUG("wm", "%s: %s(%s, %s)", __func__, evname, label, area);
+void binding_api::send_event(char const *evname, char const *label, char const *area,
+                             int x, int y, int w, int h) {
+   HMI_DEBUG("wm", "%s: %s(%s, %s) x:%d y:%d w:%d h:%d",
+             __func__, evname, label, area, x, y, w, h);
+
+   json_object *j_rect = json_object_new_object();
+   json_object_object_add(j_rect, kKeyX,      json_object_new_int(x));
+   json_object_object_add(j_rect, kKeyY,      json_object_new_int(y));
+   json_object_object_add(j_rect, kKeyWidth,  json_object_new_int(w));
+   json_object_object_add(j_rect, kKeyHeight, json_object_new_int(h));
 
    json_object *j = json_object_new_object();
    json_object_object_add(j, kKeyDrawingName, json_object_new_string(label));
    json_object_object_add(j, kKeyDrawingArea, json_object_new_string(area));
+   json_object_object_add(j, kKeyDrawingRect, j_rect);
 
    int ret = afb_event_push(g_afb_instance->app.map_afb_event[evname], j);
    if (ret != 0) {
diff --git a/src/wayland.cpp b/src/wayland.cpp
index 53668d2..9361b74 100644
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -148,6 +148,8 @@ void output::geometry(int32_t x, int32_t y, int32_t pw, int32_t ph,
    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;
 }
 
@@ -169,6 +171,7 @@ void output::done() {
        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);
    }
 }
 
diff --git a/src/wayland.hpp b/src/wayland.hpp
index 59d7ade..df5d198 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -96,6 +96,8 @@ struct display {
 struct output : wayland_proxy<struct wl_output> {
    int width{};
    int height{};
+   int physical_width{};
+   int physical_height{};
    int refresh{};
    int transform{};
 
@@ -250,7 +252,8 @@ struct controller : public wayland_proxy<struct ivi_controller> {
    layer_map_type layers;
    screen_map_type screens;
 
-   size output_size;
+   size output_size;   // Display size[pixel]
+   size physical_size; // Display size[mm]
 
    wm::controller_hooks *chooks;