X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=6a7fc69105d7701588df17e526f5d551a0f4bf1b;hb=2b84aa5d33611d0f2f7b8c4395dc352ebf60ea29;hp=88ee0fa9d60a763a726953cf51aabf6ce6043588;hpb=d41f142b48e7d38031be8339b15e377d5b264b0a;p=staging%2Fwindowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 88ee0fa..6a7fc69 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -14,10 +14,6 @@ * limitations under the License. */ -// -// Created by mfritzsc on 7/11/17. -// - #include "app.hpp" #include "json_helper.hpp" #include "layers.hpp" @@ -139,7 +135,7 @@ App::App(wl::display *d) try { { auto l = load_layer_map( - this->config.get_string("layers.json").value().c_str()); + this->config.get_string("layers.json").value().c_str()); if (l.is_ok()) { this->layers = l.unwrap(); } else { @@ -148,8 +144,8 @@ App::App(wl::display *d) } { - auto l = load_layout( - this->config.get_string("layout.json").value().c_str()); + auto l = + load_layout(this->config.get_string("layout.json").value().c_str()); if (l.is_ok()) { this->layouts = l.unwrap(); } else { @@ -320,7 +316,7 @@ void App::surface_set_layout(uint32_t surface_id) { } char const *App::activate_surface(uint32_t surface_id) { - if (! this->controller->surface_exists(surface_id)) { + if (!this->controller->surface_exists(surface_id)) { return "Surface does not exist"; } @@ -332,7 +328,7 @@ char const *App::activate_surface(uint32_t surface_id) { auto &s = this->controller->surfaces[surface_id]; // Set all others invisible - for (auto &i: this->controller->surfaces) { + for (auto &i : this->controller->surfaces) { auto &si = this->controller->sprops[i.second->id]; if (si.visibility == 1 && si.id != s->id && int(si.id) != this->layers.main_surface) { @@ -375,7 +371,6 @@ void App::surface_created(uint32_t surface_id) { DB("surface_id is " << surface_id); // We need to execute the surface setup after its creation. - // XXX: perhaps move the late-tasks functionality to App? this->add_task("surface_set_layout", [surface_id, this] { this->surface_set_layout(surface_id); }); } @@ -431,7 +426,7 @@ binding_api::result_type binding_api::debug_terminate() { } binding_api::result_type binding_api::demo_activate_surface( - uint32_t surfaceid) { + uint32_t surfaceid) { char const *e = this->app->activate_surface(surfaceid); if (e) { return Err(e); @@ -440,7 +435,7 @@ binding_api::result_type binding_api::demo_activate_surface( } binding_api::result_type binding_api::demo_activate_all() { - for (auto &s: this->app->controller->surfaces) { + for (auto &s : this->app->controller->surfaces) { s.second->set_visibility(1); } this->app->controller->commit_changes();