summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-06-26 13:19:21 +0200
committerMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-08-08 17:24:00 +0200
commitdc465727c14a7d7588dad8554afc08f55e769b76 (patch)
tree1267319faf5e1d08ad78016eabe013f717bf7708
parent1cdae57a5ac7f1fecb6d3c7f7cef019e331c43a2 (diff)
wayland: clang-format
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
-rw-r--r--src/wayland.cpp20
-rw-r--r--src/wayland.hpp22
2 files changed, 21 insertions, 21 deletions
diff --git a/src/wayland.cpp b/src/wayland.cpp
index baf1aaa..2bae9e8 100644
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -74,8 +74,8 @@ void registry::global(uint32_t name, char const *iface, uint32_t v) {
auto b = this->bindings.find(iface);
if (b != this->bindings.end())
b->second(this->proxy, name, v);
- logdebug("wl::registry @ %p global n %u i %s v %u", this->proxy, name,
- iface, v);
+ logdebug("wl::registry @ %p global n %u i %s v %u", this->proxy, name, iface,
+ v);
}
void registry::global_remove(uint32_t name) {}
@@ -318,14 +318,14 @@ constexpr struct ivi_controller_layer_listener layer_listener = {
layer::layer(uint32_t i, struct controller *c) : layer(i, 0, 0, c) {}
layer::layer(uint32_t i, int32_t w, int32_t h, struct controller *c)
- : wayland_proxy(ivi_controller_layer_create(c->proxy, i, w, h))
- , controlled_entity(c, i)
- , dst_rect{}
- , src_rect{}
- , size{}
- , orientation{}
- , visibility{}
- , opacity{} {
+ : wayland_proxy(ivi_controller_layer_create(c->proxy, i, w, h)),
+ controlled_entity(c, i),
+ dst_rect{},
+ src_rect{},
+ size{},
+ orientation{},
+ visibility{},
+ opacity{} {
ivi_controller_layer_add_listener(this->proxy, &layer_listener, this);
}
diff --git a/src/wayland.hpp b/src/wayland.hpp
index dc1d729..ba1effd 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -6,8 +6,8 @@
#include "util.h"
#include <functional>
-#include <unordered_map>
#include <memory>
+#include <unordered_map>
#include <vector>
// _ _
@@ -46,17 +46,17 @@ namespace wl {
// |_| \___|\__, |_|___/\__|_| \__, |
// |___/ |___/
struct registry : public wayland_proxy<struct wl_registry> {
- typedef std::function<void(struct wl_registry *, uint32_t, uint32_t)> binder;
- std::unordered_map<std::string, binder> bindings;
+ typedef std::function<void(struct wl_registry *, uint32_t, uint32_t)> binder;
+ std::unordered_map<std::string, binder> bindings;
- registry(struct wl_display *d);
- ~registry();
+ registry(struct wl_display *d);
+ ~registry();
- void add_global_handler(char const *iface, binder bind);
+ void add_global_handler(char const *iface, binder bind);
- // Events
- void global(uint32_t name, char const *iface, uint32_t v);
- void global_remove(uint32_t name);
+ // Events
+ void global(uint32_t name, char const *iface, uint32_t v);
+ void global_remove(uint32_t name);
};
// _ _ _
@@ -256,7 +256,7 @@ struct layer : public wayland_proxy<struct ivi_controller_layer>,
}
void set_render_order(std::vector<uint32_t> const &ro) {
- struct wl_array wlro{
+ struct wl_array wlro {
.size = ro.size() * sizeof(ro[0]),
.alloc = ro.capacity() * sizeof(ro[0]),
.data = const_cast<void *>(static_cast<void const *>(ro.data()))
@@ -280,7 +280,7 @@ struct screen : public wayland_proxy<struct ivi_controller_screen>,
ivi_controller_screen_add_layer(this->proxy, l->proxy);
}
void set_render_order(std::vector<uint32_t> const &ro) {
- struct wl_array wlro{
+ struct wl_array wlro {
.size = ro.size() * sizeof(ro[0]),
.alloc = ro.capacity() * sizeof(ro[0]),
.data = const_cast<void *>(static_cast<void const *>(ro.data()))