X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=3ee4379c9f7f86ff84b9f6f9936ec0d9575947a9;hb=f7f02a664fc0438f00e6bd09797a3bf4184c123f;hp=246b629a5258fc2eb8db747877fe784376b8a2a4;hpb=ef6f72786ab7c7791a0dce9b63412b04b9351ddb;p=staging%2Fwindowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 246b629..3ee4379 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -80,7 +80,6 @@ App::App(wl::display *d) controller{}, outputs(), config(), - layouts(), layers(), id_alloc{}, pending_events(false), @@ -223,14 +222,12 @@ int App::init_layers() { // XXX: This likely needs to be sorted by order (note, we don't (yet?) // do any zorder arrangement). for (auto const &i : this->layers.mapping) { - c->layer_create(i.layer_id, o->width, o->height); - auto &l = layers[i.layer_id]; + c->layer_create(i.second.layer_id, o->width, o->height); + auto &l = layers[i.second.layer_id]; l->set_destination_rectangle(0, 0, o->width, o->height); l->set_visibility(1); - logdebug( - "Setting up layer %s (%d) for surfaces %d-%d and role match \"%s\"", - i.name.c_str(), i.layer_id, i.id_min, i.id_max, i.role.c_str()); - this->layouts[l->id] = LayoutState{}; + logdebug("Setting up layer %s (%d) for surface role match \"%s\"", + i.second.name.c_str(), i.second.layer_id, i.second.role.c_str()); } // Add layers to screen (XXX: are they sorted correctly?) @@ -379,7 +376,7 @@ char const *App::api_activate_surface(char const *drawing_name) { auto o_state = *this->layers.get_layout_state(*surface_id); - if (!o_state) { + if (o_state == nullptr) { return "Could not find layer for surface"; } @@ -387,20 +384,20 @@ char const *App::api_activate_surface(char const *drawing_name) { // disable layers that are above our current layer for (auto const &l : this->layers.mapping) { - if (l.layer_id <= *layer_id) { + if (l.second.layer_id <= *layer_id) { continue; } bool flush = false; - if (l.state.main != -1) { - this->deactivate(l.state.main); - l.state.main = -1; + if (l.second.state.main != -1) { + this->deactivate(l.second.state.main); + l.second.state.main = -1; flush = true; } - if (l.state.sub != -1) { - this->deactivate(l.state.sub); - l.state.sub = -1; + if (l.second.state.sub != -1) { + this->deactivate(l.second.state.sub); + l.second.state.sub = -1; flush = true; } @@ -413,9 +410,6 @@ char const *App::api_activate_surface(char const *drawing_name) { return "Surface already active"; } - // This should involve a policy check, but as we do not (yet) have - // such a thing, we will just switch to this surface. - // XXX: input focus missing!!1 if (state.main == -1) { this->try_layout( @@ -431,7 +425,6 @@ char const *App::api_activate_surface(char const *drawing_name) { } else { bool can_split = this->can_split(state, *surface_id); - if (state.sub == -1) { if (can_split) { this->try_layout( state, @@ -442,6 +435,9 @@ char const *App::api_activate_surface(char const *drawing_name) { this->surface_set_layout(state.main, surface_id); this->activate(*surface_id); + if (state.sub != -1) { + this->deactivate(state.sub); + } state = nl; this->layout_commit(); @@ -456,7 +452,9 @@ char const *App::api_activate_surface(char const *drawing_name) { this->surface_set_layout(*surface_id); this->deactivate(state.main); this->activate(*surface_id); - this->deactivate(state.sub); + if (state.sub != -1) { + this->deactivate(state.sub); + } state = nl; this->layout_commit(); @@ -464,7 +462,6 @@ char const *App::api_activate_surface(char const *drawing_name) { this->enqueue_flushdraw(state.main); }); } - } } // no error @@ -485,7 +482,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) { auto o_state = *this->layers.get_layout_state(*surface_id); - if (!o_state) { + if (o_state == nullptr) { return "Could not find layer for surface"; } @@ -520,6 +517,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) { this->try_layout(state, LayoutState{-1, -1}, [&] (LayoutState const &nl) { this->deactivate(*surface_id); state = nl; + this->layout_commit(); }); } } else if (state.sub == *surface_id) { @@ -625,11 +623,11 @@ void App::surface_removed(uint32_t surface_id) { } void App::emit_activated(char const *label) { - this->api.send_event("activated", label); + this->api.send_event("active", label); } void App::emit_deactivated(char const *label) { - this->api.send_event("deactivated", label); + this->api.send_event("inactive", label); } void App::emit_syncdraw(char const *label) { @@ -679,7 +677,8 @@ result App::api_request_surface(char const *drawing_name) { } void App::activate(int id) { - if (this->controller->sprops[id].visibility == 0) { + auto ip = this->controller->sprops.find(id); + if (ip != this->controller->sprops.end() && ip->second.visibility == 0) { this->controller->surfaces[id]->set_visibility(1); char const *label = this->lookup_name(id).value_or("unknown-name").c_str(); @@ -689,7 +688,8 @@ void App::activate(int id) { } void App::deactivate(int id) { - if (this->controller->sprops[id].visibility != 0) { + auto ip = this->controller->sprops.find(id); + if (ip != this->controller->sprops.end() && ip->second.visibility != 0) { this->controller->surfaces[id]->set_visibility(0); char const *label = this->lookup_name(id).value_or("unknown-name").c_str(); @@ -742,7 +742,7 @@ bool App::can_split(struct LayoutState const &state, int new_id) { return false; } -void App::try_layout(struct LayoutState &state, +void App::try_layout(struct LayoutState & /*state*/, struct LayoutState const &new_layout, std::function apply) { if (this->policy.layout_is_valid(new_layout)) { @@ -764,4 +764,13 @@ void controller_hooks::surface_removed(uint32_t surface_id) { this->app->surface_removed(surface_id); } +void controller_hooks::surface_visibility(uint32_t /*surface_id*/, + uint32_t /*v*/) {} + +void controller_hooks::surface_destination_rectangle(uint32_t /*surface_id*/, + uint32_t /*x*/, + uint32_t /*y*/, + uint32_t /*w*/, + uint32_t /*h*/) {} + } // namespace wm