X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.hpp;h=61a840dadfc9af526b9fea54394ed9d8e704f250;hb=refs%2Ftags%2Feel%2F5.0.2;hp=3560e2c78ec5b7a82d6d21e322561f22cd71c5df;hpb=852cc727023d68ea0a439b68a18b144ce62c8fbe;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.hpp b/src/wayland.hpp
index 3560e2c..61a840d 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #ifndef WM_WAYLAND_HPP
 #define WM_WAYLAND_HPP
 
@@ -73,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();
@@ -93,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;
@@ -131,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;
 }
 
@@ -235,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;
@@ -263,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;
@@ -278,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);