X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.hpp;h=b5e2d517177470974703125b069bf2a63655d8b7;hb=da534c85f4dd4bb83a7f364a3b93a2ba156c7bcb;hp=3b81e153c567577749a835f4e299c7547fcf988d;hpb=b166f3512f5e426e60a4ff610a9f07239ac18ea1;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.hpp b/src/wayland.hpp
index 3b81e15..b5e2d51 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -1,8 +1,8 @@
 #ifndef WM_WAYLAND_HPP
 #define WM_WAYLAND_HPP
 
+#include "controller_hooks.hpp"
 #include "ivi-controller-client-protocol.h"
-
 #include "util.hpp"
 
 #include <functional>
@@ -76,6 +76,11 @@ struct display {
    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);
+   }
 };
 
 //              _               _
@@ -120,7 +125,7 @@ struct size {
 };
 
 struct rect {
-   uint32_t w, h;
+   int32_t w, h;
    int32_t x, y;
 };
 
@@ -258,6 +263,8 @@ struct controller : public wayland_proxy<struct ivi_controller> {
 
    size output_size;
 
+   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);
    void add_proxy_to_id_mapping(struct ivi_controller_layer *p, uint32_t id);