diff options
author | 2017-08-17 17:03:00 +0200 | |
---|---|---|
committer | 2017-09-04 16:53:57 +0200 | |
commit | 42f7dfd87b7192ecd326598d627e32a5feddf43b (patch) | |
tree | 1facf57655ba9476eaae9db343ca727920b9e7bc /src/app.cpp | |
parent | 6a4504b1fe5e17a09a019edf0377646cc5dd72aa (diff) |
clang-format
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Diffstat (limited to 'src/app.cpp')
-rw-r--r-- | src/app.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/app.cpp b/src/app.cpp index c38a7f4..fbeb4fd 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -28,10 +28,10 @@ #include <json-c/json.h> +#include <algorithm> #include <bits/signum.h> #include <csignal> #include <fstream> -#include <algorithm> #include <json.hpp> namespace wm { @@ -129,8 +129,7 @@ App::App(wl::display *d) layers(), pending(), name_mapping(), - id_alloc{} -{ + id_alloc{} { assert(g_app == nullptr); g_app = this; @@ -284,7 +283,8 @@ void App::surface_set_layout(uint32_t surface_id) { } uint32_t layer_id = o_layer_id.value(); - logdebug("surface_set_layout for surface %u on layer %u", surface_id, layer_id); + logdebug("surface_set_layout for surface %u on layer %u", surface_id, + layer_id); auto const &layer = this->layers.get_layer(layer_id); auto rect = layer.value().rect; @@ -390,7 +390,7 @@ result<int> App::request_surface(char const *drawing_name) { } auto rname = this->id_alloc[drawing_name]; - if (! rname) { + if (!rname) { // name does not exist yet, allocate surface id... // XXX: how to allocate surface IDs? // * allocate by running a counter for each layer? @@ -400,10 +400,9 @@ result<int> App::request_surface(char const *drawing_name) { auto id = int(this->id_alloc(drawing_name)); this->layers.add_surface(id, lid.value()); - // XXX: setup the main_surface id if we registered HomeScreen // XXX: you should fix this! if (!this->layers.main_surface_name.empty() && - this->layers.main_surface_name == drawing_name) { + this->layers.main_surface_name == drawing_name) { this->layers.main_surface = id; this->activate_surface(id); logdebug("Set main_surface id to %u", id); @@ -416,11 +415,12 @@ result<int> App::request_surface(char const *drawing_name) { return Err<int>("Surface already present"); } -char const* App::activate_surface(char const *drawing_name) { +char const *App::activate_surface(char const *drawing_name) { auto osid = this->id_alloc[drawing_name]; if (osid) { - logdebug("ativate surface with name %s and id %u", drawing_name, osid.value()); + logdebug("ativate surface with name %s and id %u", drawing_name, + osid.value()); this->activate_surface(osid.value()); return nullptr; } @@ -439,7 +439,7 @@ binding_api::result_type binding_api::request_surface( char const *drawing_name) { auto r = this->app->request_surface(drawing_name); if (r.is_err()) { - return Err<json_object*>(r.unwrap_err()); + return Err<json_object *>(r.unwrap_err()); } return Ok(json_object_new_int(r.unwrap())); } |