X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.hpp;h=61a840dadfc9af526b9fea54394ed9d8e704f250;hb=6fdda786876d9640a6a26f05ef2c5aa7e2175421;hp=b0b3674ae1d487cb2b98053f63b1e09981ffa63e;hpb=daf3f38d2d89b0073bdbee2a531e00dc00e172c1;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.hpp b/src/wayland.hpp
index b0b3674..61a840d 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -89,6 +89,8 @@ struct display {
    bool ok() const;
    void roundtrip();
    int dispatch();
+   int dispatch_pending();
+   int read_events();
    void flush();
    int get_fd() const;
    int get_error();
@@ -109,6 +111,7 @@ struct output : wayland_proxy<struct wl_output> {
    int width{};
    int height{};
    int refresh{};
+   int transform{};
 
    output(output const &) = delete;
    output &operator=(output const &) = delete;
@@ -147,7 +150,7 @@ struct rect {
 
 static const constexpr rect full_rect = rect{-1, -1, 0, 0};
 
-inline bool operator == (struct rect a, struct rect b) {
+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;
 }
 
@@ -251,6 +254,8 @@ struct screen : public wayland_proxy<struct ivi_controller_screen>,
 //  \___\___/|_| |_|\__|_|  \___/|_|_|\___|_|
 //
 struct controller : public wayland_proxy<struct ivi_controller> {
+   // 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;
@@ -279,10 +284,6 @@ struct controller : public wayland_proxy<struct ivi_controller> {
    layer_map_type layers;
    screen_map_type screens;
 
-   typedef std::pair<char const *, std::function<void(struct controller *)>>
-      name_task_pair;
-   std::vector<name_task_pair> pending;
-
    size output_size;
 
    wm::controller_hooks *chooks;
@@ -294,9 +295,13 @@ struct controller : public wayland_proxy<struct ivi_controller> {
    void add_proxy_to_id_mapping(struct wl_output *p, uint32_t id);
    void remove_proxy_to_id_mapping(struct wl_output *p);
 
-   void add_task(char const *name,
-                 std::function<void(struct controller *)> &&f);
-   void execute_pending();
+   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);