clang-format, mostly indenting.

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>

diff --git a/src/app.cpp b/src/app.cpp
index 29f37e4..b261c53 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -3,8 +3,8 @@
 //
 
 #include "app.hpp"
-#include "util.hpp"
 #include "json_helper.hpp"
+#include "util.hpp"
 #include "wayland.hpp"
 
 #include <cassert>
@@ -13,151 +13,149 @@
 
 namespace wm {
 
-    namespace {
-        App *g_app;
-        }  // namespace
-
-        App::App(wl::display *d)
-           : api{this}, display{d}, controller{}, outputs() {
-           assert(g_app == nullptr);
-           g_app = this;
-    }
-
-    int App::init() {
-        if (!this->display->ok()) {
-            return -1;
-        }
-
-        this->display->r.add_global_handler("wl_output", [](wl_registry *r,
-                                                            uint32_t name,
-                                                            uint32_t v) {
-            g_app->outputs.emplace_back(std::make_unique<wl::output>(r, name, v));
-        });
-
-        this->display->r.add_global_handler(
-                "ivi_controller", [](wl_registry *r, uint32_t name, uint32_t v) {
-                    g_app->controller =
-                            std::make_unique<genivi::controller>(r, name, v);
-
-                    // XXX: This protocol needs the output, so lets just add our mapping
-                    // here...
-                    g_app->controller->add_proxy_to_id_mapping(
-                            g_app->outputs.back()->proxy.get(),
-                            wl_proxy_get_id(reinterpret_cast<struct wl_proxy *>(
-                                                    g_app->outputs.back()->proxy.get())));
-                });
-
-        // First level objects
-        this->display->roundtrip();
-        // Second level objects
-        this->display->roundtrip();
-        // Third level objects
-        this->display->roundtrip();
-
-        return init_layout();
-    }
-
-    int App::dispatch_events() {
-        int ret = this->display->dispatch();
-        if (ret == -1) {
-            logerror("wl_display_dipatch() returned error %d",
-                     this->display->get_error());
-            return -1;
-        }
-        this->display->flush();
-
-        // execute pending tasks, that is layout changes etc.
-        this->controller->execute_pending();
-        this->display->roundtrip();
-
-        return 0;
-    }
-
-    //  _       _ _       _                         _    ____
-    // (_)_ __ (_) |_    | | __ _ _   _  ___  _   _| |_ / /\ \
-    // | | '_ \| | __|   | |/ _` | | | |/ _ \| | | | __| |  | |
-    // | | | | | | |_    | | (_| | |_| | (_) | |_| | |_| |  | |
-    // |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| |  | |
-    //              |_____|       |___/                 \_\/_/
-    int App::init_layout() {
-        if (!this->controller) {
-            logerror("ivi_controller global not available");
-            return -1;
-        }
-
-        if (this->outputs.empty()) {
-            logerror("no output was set up!");
-            return -1;
-        }
-
-        auto &c = this->controller;
-
-        auto &o = this->outputs.front();
-        auto &s = c->screens.begin()->second;
-        auto &layers = c->layers;
-
-        // XXX: Write output dimensions to ivi controller...
-        c->output_size = genivi::size{uint32_t(o->width), uint32_t(o->height)};
-
-        // Clear scene
-        layers.clear();
-
-        // Clear screen
-        s->clear();
-
-        // Setup our dummy scene...
-        c->layer_create(100, 0, 0);   // bottom layer, anything else
-        c->layer_create(1000, 0, 0);  // top layer, mandelbrot
-
-        auto &l100 = c->layers[100];
-        auto &l1k = c->layers[1000];
-
-        // Set layers fullscreen
-        l100->set_destination_rectangle(0, 0, o->width, o->height);
-        l1k->set_destination_rectangle(0, 0, o->width, o->height);
-        l100->set_visibility(1);
-        l1k->set_visibility(1);
-
-        // Add layers to screen
-        s->set_render_order({100, 1000});
-
-        c->commit_changes();
-
-        this->display->flush();
-
-        return 0;
-    }
-
-    binding_api::result_type binding_api::register_surface(uint32_t appid,
-                                                          uint32_t surfid) {
-        logdebug("%s appid %u surfid %u", __func__, appid, surfid);
-        if (appid > 0xff) {
-            return Err<json_object *>("invalid appid");
-        }
-
-        if (surfid > 0xffff) {
-            return Err<json_object *>("invalid surfaceid");
-        }
-
-        return Ok(json_object_new_int((appid << 16) + surfid));
-    }
-
-    binding_api::result_type binding_api::debug_layers() {
-        logdebug("%s", __func__);
-        return Ok(to_json(this->app->controller->lprops));
-    }
-
-    binding_api::result_type binding_api::debug_surfaces() {
-        logdebug("%s", __func__);
-        return Ok(to_json(this->app->controller->sprops));
-    }
-
-    binding_api::result_type binding_api::debug_status() {
-        logdebug("%s", __func__);
-        json_object *jr = json_object_new_object();
-        json_object_object_add(jr, "surfaces", to_json(this->app->controller->sprops));
-        json_object_object_add(jr, "layers", to_json(this->app->controller->lprops));
-        return Ok(jr);
-    }
-
-} // namespace wm
\ No newline at end of file
+namespace {
+App *g_app;
+}  // namespace
+
+App::App(wl::display *d) : api{this}, display{d}, controller{}, outputs() {
+   assert(g_app == nullptr);
+   g_app = this;
+}
+
+int App::init() {
+   if (!this->display->ok()) {
+      return -1;
+   }
+
+   this->display->r.add_global_handler(
+      "wl_output", [](wl_registry *r, uint32_t name, uint32_t v) {
+         g_app->outputs.emplace_back(std::make_unique<wl::output>(r, name, v));
+      });
+
+   this->display->r.add_global_handler(
+      "ivi_controller", [](wl_registry *r, uint32_t name, uint32_t v) {
+         g_app->controller = std::make_unique<genivi::controller>(r, name, v);
+
+         // XXX: This protocol needs the output, so lets just add our mapping
+         // here...
+         g_app->controller->add_proxy_to_id_mapping(
+            g_app->outputs.back()->proxy.get(),
+            wl_proxy_get_id(reinterpret_cast<struct wl_proxy *>(
+               g_app->outputs.back()->proxy.get())));
+      });
+
+   // First level objects
+   this->display->roundtrip();
+   // Second level objects
+   this->display->roundtrip();
+   // Third level objects
+   this->display->roundtrip();
+
+   return init_layout();
+}
+
+int App::dispatch_events() {
+   int ret = this->display->dispatch();
+   if (ret == -1) {
+      logerror("wl_display_dipatch() returned error %d",
+               this->display->get_error());
+      return -1;
+   }
+   this->display->flush();
+
+   // execute pending tasks, that is layout changes etc.
+   this->controller->execute_pending();
+   this->display->roundtrip();
+
+   return 0;
+}
+
+//  _       _ _       _                         _    ____
+// (_)_ __ (_) |_    | | __ _ _   _  ___  _   _| |_ / /\ \
+// | | '_ \| | __|   | |/ _` | | | |/ _ \| | | | __| |  | |
+// | | | | | | |_    | | (_| | |_| | (_) | |_| | |_| |  | |
+// |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| |  | |
+//              |_____|       |___/                 \_\/_/
+int App::init_layout() {
+   if (!this->controller) {
+      logerror("ivi_controller global not available");
+      return -1;
+   }
+
+   if (this->outputs.empty()) {
+      logerror("no output was set up!");
+      return -1;
+   }
+
+   auto &c = this->controller;
+
+   auto &o = this->outputs.front();
+   auto &s = c->screens.begin()->second;
+   auto &layers = c->layers;
+
+   // XXX: Write output dimensions to ivi controller...
+   c->output_size = genivi::size{uint32_t(o->width), uint32_t(o->height)};
+
+   // Clear scene
+   layers.clear();
+
+   // Clear screen
+   s->clear();
+
+   // Setup our dummy scene...
+   c->layer_create(100, 0, 0);   // bottom layer, anything else
+   c->layer_create(1000, 0, 0);  // top layer, mandelbrot
+
+   auto &l100 = c->layers[100];
+   auto &l1k = c->layers[1000];
+
+   // Set layers fullscreen
+   l100->set_destination_rectangle(0, 0, o->width, o->height);
+   l1k->set_destination_rectangle(0, 0, o->width, o->height);
+   l100->set_visibility(1);
+   l1k->set_visibility(1);
+
+   // Add layers to screen
+   s->set_render_order({100, 1000});
+
+   c->commit_changes();
+
+   this->display->flush();
+
+   return 0;
+}
+
+binding_api::result_type binding_api::register_surface(uint32_t appid,
+                                                       uint32_t surfid) {
+   logdebug("%s appid %u surfid %u", __func__, appid, surfid);
+   if (appid > 0xff) {
+      return Err<json_object *>("invalid appid");
+   }
+
+   if (surfid > 0xffff) {
+      return Err<json_object *>("invalid surfaceid");
+   }
+
+   return Ok(json_object_new_int((appid << 16) + surfid));
+}
+
+binding_api::result_type binding_api::debug_layers() {
+   logdebug("%s", __func__);
+   return Ok(to_json(this->app->controller->lprops));
+}
+
+binding_api::result_type binding_api::debug_surfaces() {
+   logdebug("%s", __func__);
+   return Ok(to_json(this->app->controller->sprops));
+}
+
+binding_api::result_type binding_api::debug_status() {
+   logdebug("%s", __func__);
+   json_object *jr = json_object_new_object();
+   json_object_object_add(jr, "surfaces",
+                          to_json(this->app->controller->sprops));
+   json_object_object_add(jr, "layers", to_json(this->app->controller->lprops));
+   return Ok(jr);
+}
+
+}  // namespace wm
\ No newline at end of file

diff --git a/src/app.hpp b/src/app.hpp
index 0fb929d..4e1c4ff 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -8,35 +8,36 @@
 #include <json-c/json.h>
 #include <memory>
 
-#include "wayland.hpp"
-#include "result.hpp"
 #include "afb_binding_api.hpp"
+#include "result.hpp"
+#include "wayland.hpp"
 
 namespace wl {
-    struct display;
+struct display;
 }
+
 namespace genivi {
-    struct controller;
+struct controller;
 }
 
 namespace wm {
 
-    struct App {
-        struct binding_api api;
+struct App {
+   struct binding_api api;
 
-        // This is the one thing, we do not own.
-        struct wl::display *display;
+   // This is the one thing, we do not own.
+   struct wl::display *display;
 
-        std::unique_ptr<struct genivi::controller> controller;
-        std::vector<std::unique_ptr<struct wl::output>> outputs;
+   std::unique_ptr<struct genivi::controller> controller;
+   std::vector<std::unique_ptr<struct wl::output>> outputs;
 
-        App(wl::display *d);
+   App(wl::display *d);
 
-        int init();
-        int dispatch_events();
-        int init_layout();
-    };
+   int init();
+   int dispatch_events();
+   int init_layout();
+};
 
-} // namespace wm
+}  // namespace wm
 
-#endif //TMCAGLWM_APP_HPP
+#endif  // TMCAGLWM_APP_HPP

diff --git a/src/main.cpp b/src/main.cpp
index 0e3a2bc..5eb211c 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -107,7 +107,7 @@ int binding_init() noexcept {
    return -1;
 }
 
-} // namespace
+}  // namespace
 
 #include "afb_binding_glue.inl"
 

diff --git a/src/result.hpp b/src/result.hpp
index fe9956b..377d5a2 100644 (file)
--- a/src/result.hpp
+++ b/src/result.hpp
@@ -9,30 +9,34 @@
 
 namespace wm {
 
-    using std::experimental::optional;
-    using std::experimental::nullopt;
+using std::experimental::optional;
+using std::experimental::nullopt;
 
-    // We only ever return a string as an error - so just parametrize
-    // this over result type T
-    template<typename T>
-    struct result {
-        char const *e;
-        optional<T> t;
+// We only ever return a string as an error - so just parametrize
+// this over result type T
+template <typename T>
+struct result {
+   char const *e;
+   optional<T> t;
 
-        bool is_ok() const { return this->t != nullopt; }
-        bool is_err() const { return this->e != nullptr; }
+   bool is_ok() const { return this->t != nullopt; }
+   bool is_err() const { return this->e != nullptr; }
 
-        T unwrap() { return this->t.value(); }
+   T unwrap() { return this->t.value(); }
 
-        char const *unwrap_err() { return this->e; }
-    };
+   char const *unwrap_err() { return this->e; }
+};
 
-    template<typename T>
-    struct result<T> Err(char const *e) { return result<T>{e, nullopt}; }
+template <typename T>
+struct result<T> Err(char const *e) {
+   return result<T>{e, nullopt};
+}
 
-    template<typename T>
-    struct result<T> Ok(T t) { return result<T>{nullptr, t}; }
+template <typename T>
+struct result<T> Ok(T t) {
+   return result<T>{nullptr, t};
+}
 
-} // namespace wm
+}  // namespace wm
 
-#endif //TMCAGLWM_RESULT_HPP
+#endif  // TMCAGLWM_RESULT_HPP

diff --git a/src/wayland.cpp b/src/wayland.cpp
index e12f155..ff08488 100644 (file)
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -425,11 +425,10 @@ void controller::layer_screen(struct layer * /*l*/, struct wl_output *screen) {
 
 void controller::layer_destroyed(struct layer *l) {
    logdebug("genivi::layer %s @ %p", __func__, this->proxy.get());
-   add_task("remove layer",
-            [l](struct controller *c) {
-                c->lprops.erase(l->id);
-                c->layers.erase(l->id);
-            });
+   add_task("remove layer", [l](struct controller *c) {
+      c->lprops.erase(l->id);
+      c->layers.erase(l->id);
+   });
 }
 
 //                  __
@@ -658,11 +657,10 @@ 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) {
-      add_task("remove surface",
-               [s](struct controller *c) {
-                   c->sprops.erase(s->id);
-                   c->surfaces.erase(s->id);
-               });
+      add_task("remove surface", [s](struct controller *c) {
+         c->sprops.erase(s->id);
+         c->surfaces.erase(s->id);
+      });
    }
 }
 

diff --git a/src/wayland.hpp b/src/wayland.hpp
index ea23ebb..3b81e15 100644 (file)
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -137,13 +137,13 @@ struct controller_child {
 };
 
 struct surface_properties {
-    uint32_t id; // let's just save an ID here too
-    struct rect dst_rect;
-    struct rect src_rect;
-    struct size size;
-    int32_t orientation;
-    int32_t visibility;
-    float opacity;
+   uint32_t id;  // let's just save an ID here too
+   struct rect dst_rect;
+   struct rect src_rect;
+   struct size size;
+   int32_t orientation;
+   int32_t visibility;
+   float opacity;
 };
 
 //                  __