+/*
+ * 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.h"
+#include "util.hpp"
#include <functional>
-#include <unordered_map>
#include <memory>
+#include <unordered_map>
#include <vector>
// _ _
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);
+ }
};
// _ _
int width{};
int height{};
int refresh{};
+ int transform{};
output(output const &) = delete;
output &operator=(output const &) = delete;
void done();
void scale(int32_t factor);
};
-}
+} // namespace wl
// _ __ __ _ _ __ ___ ___ ___ _ __ __ _ ___ ___
// | '_ \ / _` | '_ ` _ \ / _ \/ __| '_ \ / _` |/ __/ _ \
};
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 {
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;
+};
+
// __
// ___ _ _ _ __ / _| __ _ ___ ___
// / __| | | | '__| |_ / _` |/ __/ _ \
//
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);
// |___/
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);
// \___\___/|_| |_|\__|_| \___/|_|_|\___|_|
//
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
// 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;
+ 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 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);
void surface_orientation(struct surface *s, int32_t orientation);
void surface_pixelformat(struct surface *s, int32_t pixelformat);
void surface_layer(struct surface *s, struct ivi_controller_layer *layer);
- void surface_stats(struct surface *s, uint32_t redraw_count, uint32_t frame_count,
- uint32_t update_count, uint32_t pid,
+ void surface_stats(struct surface *s, uint32_t redraw_count,
+ uint32_t frame_count, uint32_t update_count, uint32_t pid,
const char *process_name);
void surface_destroyed(struct surface *s);
void surface_content(struct surface *s, int32_t content_state);
// layer
void layer_visibility(struct layer *l, int32_t visibility);
void layer_opacity(struct layer *l, float opacity);
- void layer_source_rectangle(struct layer *l, int32_t x, int32_t y, int32_t width,
- int32_t height);
+ void layer_source_rectangle(struct layer *l, int32_t x, int32_t y,
+ int32_t width, int32_t height);
void layer_destination_rectangle(struct layer *l, int32_t x, int32_t y,
int32_t width, int32_t height);
void layer_configuration(struct layer *l, int32_t width, int32_t height);
void layer_screen(struct layer *l, struct wl_output *screen);
void layer_destroyed(struct layer *l);
};
-}
+} // namespace genivi
#endif // !WM_WAYLAND_HPP
Code Review / staging / windowmanager.git / blobdiff