Code Review
/
staging
/
windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
wayland: add genivi::full_rect and operator== for genivi::rect
[staging/windowmanager.git]
/
src
/
wayland.hpp
diff --git
a/src/wayland.hpp
b/src/wayland.hpp
index
e2a1259
..
3560e2c
100644
(file)
--- a/
src/wayland.hpp
+++ b/
src/wayland.hpp
@@
-1,8
+1,8
@@
#ifndef WM_WAYLAND_HPP
#define WM_WAYLAND_HPP
#ifndef WM_WAYLAND_HPP
#define WM_WAYLAND_HPP
+#include "controller_hooks.hpp"
#include "ivi-controller-client-protocol.h"
#include "ivi-controller-client-protocol.h"
-
#include "util.hpp"
#include <functional>
#include "util.hpp"
#include <functional>
@@
-125,10
+125,16
@@
struct size {
};
struct rect {
};
struct rect {
-
u
int32_t w, h;
+ int32_t w, h;
int32_t x, y;
};
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 {
struct controller;
struct controller_child {
@@
-263,6
+269,8
@@
struct controller : public wayland_proxy<struct ivi_controller> {
size output_size;
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);
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);