Code Review
/
apps
/
agl-service-windowmanager-2017.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add an another example for layout configuration"
[apps/agl-service-windowmanager-2017.git]
/
src
/
wayland.hpp
diff --git
a/src/wayland.hpp
b/src/wayland.hpp
index
f6d17b4
..
b72edc6
100644
(file)
--- a/
src/wayland.hpp
+++ b/
src/wayland.hpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (
C) 2017 Mentor Graphics Development (Deutschland) GmbH
+ * Copyright (
c) 2017 TOYOTA MOTOR CORPORATION
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-132,12
+132,9
@@
struct output : wayland_proxy<struct wl_output> {
// |_| |_|\__,_|_| |_| |_|\___||___/ .__/ \__,_|\___\___|
// |_|
// _ _
// |_| |_|\__,_|_| |_| |_|\___||___/ .__/ \__,_|\___\___|
// |_|
// _ _
-// __ _ ___ _ __ (_)_ _(_)
-// / _` |/ _ \ '_ \| \ \ / / |
-// | (_| | __/ | | | |\ V /| |
-// \__, |\___|_| |_|_| \_/ |_|
-// |___/
-namespace genivi {
+
+// namespace compositor
+namespace compositor {
struct size {
uint32_t w, h;
struct size {
uint32_t w, h;
@@
-351,6
+348,6
@@
struct controller : public wayland_proxy<struct ivi_controller> {
void layer_screen(struct layer *l, struct wl_output *screen);
void layer_destroyed(struct layer *l);
};
void layer_screen(struct layer *l, struct wl_output *screen);
void layer_destroyed(struct layer *l);
};
-} // namespace
genivi
+} // namespace
compositor
#endif // !WM_WAYLAND_HPP
#endif // !WM_WAYLAND_HPP