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
main: flush after execute_pending
[staging/windowmanager.git]
/
src
/
wayland.hpp
diff --git
a/src/wayland.hpp
b/src/wayland.hpp
index
c3d4c2f
..
44f6cb4
100644
(file)
--- a/
src/wayland.hpp
+++ b/
src/wayland.hpp
@@
-201,7
+201,15
@@
struct surface : public wayland_proxy<struct ivi_controller_surface>,
// |___/
struct layer : public wayland_proxy<struct ivi_controller_layer>,
controlled_entity {
// |___/
struct layer : public wayland_proxy<struct ivi_controller_layer>,
controlled_entity {
+ struct rect dst_rect;
+ struct rect src_rect;
+ struct size size;
+ int32_t orientation;
+ int32_t visibility;
+ float opacity;
+
layer(uint32_t i, struct controller *c);
layer(uint32_t i, struct controller *c);
+ layer(uint32_t i, int32_t w, int32_t h, struct controller *c);
~layer() override;
// Requests
~layer() override;
// Requests
@@
-263,6
+271,11
@@
struct layer : public wayland_proxy<struct ivi_controller_layer>,
struct screen : public wayland_proxy<struct ivi_controller_screen>,
controlled_entity {
screen(uint32_t i, struct controller *c, struct ivi_controller_screen *p);
struct screen : public wayland_proxy<struct ivi_controller_screen>,
controlled_entity {
screen(uint32_t i, struct controller *c, struct ivi_controller_screen *p);
+
+ void clear() { ivi_controller_screen_clear(this->proxy); }
+ void add_layer(layer *l) {
+ ivi_controller_screen_add_layer(this->proxy, l->proxy);
+ }
};
// _ _ _
};
// _ _ _
@@
-276,24
+289,37
@@
struct controller : public wayland_proxy<struct ivi_controller> {
std::map<uint32_t, std::unique_ptr<struct layer>> layers;
std::map<uint32_t, std::unique_ptr<struct screen>> screens;
std::map<uint32_t, std::unique_ptr<struct layer>> layers;
std::map<uint32_t, std::unique_ptr<struct screen>> screens;
- std::vector<std::function<void(struct controller *)>> pending;
+ typedef std::pair<char const *, std::function<void(struct controller *)>>
+ name_task_pair;
+ std::vector<name_task_pair> pending;
+
+ size output_size;
- void add_task(std::function<void(struct controller *)> &&f) {
- this->pending.emplace_back(f);
+ void add_task(char const *name,
+ std::function<void(struct controller *)> &&f) {
+ this->pending.emplace_back(std::make_pair(name, f));
}
}
+
void execute_pending() {
if (!this->pending.empty()) {
for (auto &t : this->pending) {
void execute_pending() {
if (!this->pending.empty()) {
for (auto &t : this->pending) {
- t(this);
+ logdebug("executing task '%s'", t.first);
+ t.second(this);
}
this->pending.clear();
ivi_controller_commit_changes(this->proxy);
}
this->pending.clear();
ivi_controller_commit_changes(this->proxy);
+ // XXX: No flush here...
}
}
controller(struct wl_registry *r, uint32_t name, uint32_t version);
~controller() override;
}
}
controller(struct wl_registry *r, uint32_t name, uint32_t version);
~controller() override;
+ // Requests
+ void commit_changes() const { ivi_controller_commit_changes(this->proxy); }
+ void layer_create(uint32_t id, int32_t w, int32_t h);
+ void surface_create(uint32_t id);
+
// Events
// controller
void controller_screen(uint32_t id, struct ivi_controller_screen *screen);
// Events
// controller
void controller_screen(uint32_t id, struct ivi_controller_screen *screen);