summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-07-28 12:34:43 +0200
committerMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-08-08 17:24:00 +0200
commitac5cfd54d5056b645781ef982ce3109581e9edef (patch)
treee04eaa1f8932e5fcfd7d1bbb5ecee753a39d648a
parentf690f1bb1a9736ec13cbe1dad721b0bbc1c3af67 (diff)
app/wayland: move surface setup as is to app controller hook
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
-rw-r--r--src/app.cpp8
-rw-r--r--src/wayland.cpp13
2 files changed, 12 insertions, 9 deletions
diff --git a/src/app.cpp b/src/app.cpp
index e28d8d0..3f62575 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -219,6 +219,14 @@ int App::init_layout() {
void App::surface_created(uint32_t surface_id) {
DB("surface_id is " << surface_id);
+ this->controller->add_task("fullscreen surface", [surface_id](struct genivi::controller *c) {
+ auto &s = c->surfaces[surface_id];
+ s->set_destination_rectangle(0, 0, c->output_size.w, c->output_size.h);
+ s->set_visibility(1);
+ uint32_t lid = surface_id == 0x16180 ? 1000 : 100;
+ c->layers[lid]->add_surface(s.get());
+ logdebug("Surface %u now fullscreen on layer %u", surface_id, lid);
+ });
}
void App::surface_removed(uint32_t surface_id) {
diff --git a/src/wayland.cpp b/src/wayland.cpp
index 424ad0d..f274874 100644
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -220,15 +220,7 @@ void controller::controller_surface(uint32_t id) {
logdebug("genivi::controller @ %p surface %u (%x)", this->proxy.get(), id,
id);
this->surfaces[id] = std::make_unique<struct surface>(id, this);
-
- add_task("fullscreen surface", [id](struct controller *c) {
- auto &s = c->surfaces[id];
- s->set_destination_rectangle(0, 0, c->output_size.w, c->output_size.h);
- s->set_visibility(1);
- uint32_t lid = id == 0x16180 ? 1000 : 100;
- c->layers[lid]->add_surface(s.get());
- logdebug("Surface %u now fullscreen on layer %u", id, lid);
- });
+ this->chooks->surface_created(id);
}
void controller::controller_error(int32_t object_id, int32_t object_type,
@@ -642,6 +634,8 @@ void controller::surface_stats(struct surface * /*s*/, uint32_t redraw_count,
void controller::surface_destroyed(struct surface *s) {
logdebug("genivi::surface %s @ %p", __func__, this->proxy.get());
+ this->chooks->surface_removed(s->id);
+ // XXX: do I need to actually remove the surface late, i.e. using add_task()?
this->sprops.erase(s->id);
this->surfaces.erase(s->id);
}
@@ -650,6 +644,7 @@ void controller::surface_content(struct surface *s, int32_t content_state) {
logdebug("genivi::surface %s @ %p s %i", __func__, this->proxy.get(),
content_state);
if (content_state == IVI_CONTROLLER_SURFACE_CONTENT_STATE_CONTENT_REMOVED) {
+ this->chooks->surface_removed(s->id); // XXX is this the right thing to do?
add_task("remove surface", [s](struct controller *c) {
c->sprops.erase(s->id);
c->surfaces.erase(s->id);