X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland_ivi_wm.hpp;h=d8915a162c8fdd20fa762b7552d52b9fbd9a6127;hb=419360d5e88e4036bc9f4fd6a5068052cf8b8703;hp=ac9a7fcf9ac388543b5945da37bd7ad3f1d1846d;hpb=2796f54cf0b80ce180542198de2b2465f9d98d95;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/wayland_ivi_wm.hpp b/src/wayland_ivi_wm.hpp
index ac9a7fc..d8915a1 100644
--- a/src/wayland_ivi_wm.hpp
+++ b/src/wayland_ivi_wm.hpp
@@ -166,6 +166,7 @@ struct surface_properties
     int32_t orientation;
     int32_t visibility;
     float opacity;
+    uint32_t pid;
 };
 
 /**
@@ -197,7 +198,6 @@ struct layer : public controller_child
 
     // 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);
     void add_surface(uint32_t surface_id);
@@ -257,6 +257,9 @@ struct controller : public wayland_proxy<struct ivi_wm>
     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;
@@ -290,31 +293,32 @@ struct controller : public wayland_proxy<struct ivi_wm>
     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(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,
+    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(struct surface *s, int32_t x, int32_t y,
+    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(struct surface *s, uint32_t surface_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(struct surface *s, int32_t width, int32_t height);
-    void surface_stats_received(struct surface *s, uint32_t surface_id,
+    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(struct surface *s, uint32_t layer_id, uint32_t surface_id);
+    void surface_added_to_layer(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,
+    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(struct layer *l, uint32_t layer_id, int32_t x, int32_t y,
+    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(struct layer *l, uint32_t layer_id);
+    void layer_destroyed(uint32_t layer_id);
     void layer_error_detected(uint32_t object_id,
                               uint32_t error_code, char const *error_text);
 };