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

diff --git a/src/wayland.hpp b/src/wayland.hpp
index ce8360f..61a840d 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -1,8 +1,24 @@
+/*
+ * 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
 
+#include "controller_hooks.hpp"
 #include "ivi-controller-client-protocol.h"
-
 #include "util.hpp"
 
 #include <functional>
@@ -73,8 +89,16 @@ struct display {
    bool ok() const;
    void roundtrip();
    int dispatch();
+   int dispatch_pending();
+   int read_events();
    void flush();
    int get_fd() const;
+   int get_error();
+
+   // Lets just proxy this for the registry
+   inline void add_global_handler(char const *iface, registry::binder bind) {
+      this->r.add_global_handler(iface, bind);
+   }
 };
 
 //              _               _
@@ -87,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;
@@ -119,10 +144,16 @@ struct size {
 };
 
 struct rect {
-   uint32_t w, h;
+   int32_t w, h;
    int32_t x, y;
 };
 
+static const constexpr rect full_rect = rect{-1, -1, 0, 0};
+
+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;
+}
+
 struct controller;
 
 struct controller_child {
@@ -135,6 +166,16 @@ struct controller_child {
    virtual ~controller_child() {}
 };
 
+struct surface_properties {
+   uint32_t id;  // let's just save an ID here too
+   struct rect dst_rect;
+   struct rect src_rect;
+   struct size size;
+   int32_t orientation;
+   int32_t visibility;
+   float opacity;
+};
+
 //                  __
 //  ___ _   _ _ __ / _| __ _  ___ ___
 // / __| | | | '__| |_ / _` |/ __/ _ \
@@ -143,13 +184,6 @@ struct controller_child {
 //
 struct surface : public wayland_proxy<struct ivi_controller_surface>,
                  controller_child {
-   struct rect dst_rect;
-   struct rect src_rect;
-   struct size size;
-   int32_t orientation;
-   int32_t visibility;
-   float opacity;
-
    surface(surface const &) = delete;
    surface &operator=(surface const &) = delete;
    surface(uint32_t i, struct controller *c);
@@ -176,13 +210,6 @@ struct surface : public wayland_proxy<struct ivi_controller_surface>,
 //          |___/
 struct layer : public wayland_proxy<struct ivi_controller_layer>,
                controller_child {
-   struct rect dst_rect;
-   struct rect src_rect;
-   struct size size;
-   int32_t orientation;
-   int32_t visibility;
-   float opacity;
-
    layer(layer const &) = delete;
    layer &operator=(layer const &) = delete;
    layer(uint32_t i, struct controller *c);
@@ -227,6 +254,18 @@ 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;
+   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 surface_properties> props_map;
+
    // HACK:
    // The order of these member is mandatory, as when objects are destroyed
    // they will call their parent (that's us right here!) and remove their
@@ -234,21 +273,20 @@ struct controller : public wayland_proxy<struct ivi_controller> {
    // when the surfaces/layers/screens maps are destroyed. This sucks, but
    // I cannot see a better solution w/o globals or some other horrible
    // call-our-parent construct.
-   std::unordered_map<uintptr_t, uint32_t> surface_proxy_to_id;
-   std::unordered_map<uintptr_t, uint32_t> layer_proxy_to_id;
-   std::unordered_map<uintptr_t, uint32_t> screen_proxy_to_id;
+   proxy_to_id_map_type surface_proxy_to_id;
+   proxy_to_id_map_type layer_proxy_to_id;
+   proxy_to_id_map_type screen_proxy_to_id;
 
-   std::unordered_map<uint32_t, std::unique_ptr<struct surface>> surfaces;
-   std::unordered_map<uint32_t, std::unique_ptr<struct layer>> layers;
-   std::unordered_map<uint32_t, std::unique_ptr<struct screen>> screens;
+   props_map sprops;
+   props_map lprops;
 
-   typedef std::pair<char const *, std::function<void(struct controller *)>>
-      name_task_pair;
-   std::vector<name_task_pair> pending;
+   surface_map_type surfaces;
+   layer_map_type layers;
+   screen_map_type screens;
 
    size output_size;
 
-   void debug_dump_current_status();
+   wm::controller_hooks *chooks;
 
    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);
@@ -257,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);