diff options
author | Kazumasa Mitsunari <knimitz@witz-inc.co.jp> | 2018-10-17 17:42:42 +0900 |
---|---|---|
committer | Kazumasa Mitsunari <knimitz@witz-inc.co.jp> | 2018-10-24 19:08:50 +0900 |
commit | 6819f403a6b8a1ab5e8cdffd9fd1460d49045059 (patch) | |
tree | 1e1509904c1ee4ececce8b7cbfa89284282a0fa1 /src/json_helper.cpp | |
parent | 9fabd6550e183283363b61f71092477342a357d1 (diff) |
Refactor : Hide wayland operations from Window Manager
Window Manager now uses abstract client, area for layer/surface management,
then hide wayland operation into LayerControl class.
LayerControl class uses ilmControl library instead of wayland protocol.
This patch reduces the binary size of binding by 30% than before.
Currently, the following debug methods are not available.
* debug_status
* debug_layers
* debug_surfaces
* list_drawing_names
Bug-AGL: SPEC-1817
Change-Id: I7313787f3c4a286ceee3c23783e5c0e713388dac
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
Diffstat (limited to 'src/json_helper.cpp')
-rw-r--r-- | src/json_helper.cpp | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/src/json_helper.cpp b/src/json_helper.cpp index cf13363..72ae36a 100644 --- a/src/json_helper.cpp +++ b/src/json_helper.cpp @@ -17,66 +17,6 @@ #include "json_helper.hpp" #include "util.hpp" -json_object *to_json(compositor::surface_properties const &s) -{ - // auto j = json::object({ - auto j = json_object_new_object(); - - // {"id", s.id}, - json_object_object_add(j, "id", json_object_new_int(s.id)); - - // {"size", {{"width", s.size.w}, {"height", s.size.h}}}, - auto jsize = json_object_new_object(); - json_object_object_add(jsize, "width", json_object_new_int(s.size.w)); - json_object_object_add(jsize, "height", json_object_new_int(s.size.h)); - json_object_object_add(j, "size", jsize); - - // {"dst", - // {{"width", s.dst_rect.w}, - // {"height", s.dst_rect.h}, - // {"x", s.dst_rect.x}, - // {"y", s.dst_rect.y}}}, - auto jdst = json_object_new_object(); - json_object_object_add(jdst, "width", json_object_new_int(s.dst_rect.w)); - json_object_object_add(jdst, "height", json_object_new_int(s.dst_rect.h)); - json_object_object_add(jdst, "x", json_object_new_int(s.dst_rect.x)); - json_object_object_add(jdst, "y", json_object_new_int(s.dst_rect.y)); - json_object_object_add(j, "dst", jdst); - - // {"src", - // {{"width", s.src_rect.w}, - // {"height", s.src_rect.h}, - // {"x", s.src_rect.x}, - // {"y", s.src_rect.y}}}, - auto jsrc = json_object_new_object(); - json_object_object_add(jsrc, "width", json_object_new_int(s.src_rect.w)); - json_object_object_add(jsrc, "height", json_object_new_int(s.src_rect.h)); - json_object_object_add(jsrc, "x", json_object_new_int(s.src_rect.x)); - json_object_object_add(jsrc, "y", json_object_new_int(s.src_rect.y)); - json_object_object_add(j, "src", jsrc); - - // {"visibility", s.visibility}, - json_object_object_add( - j, "visibility", - json_object_new_boolean(static_cast<json_bool>(s.visibility == 1))); - - // {"opacity", s.opacity}, - json_object_object_add(j, "opacity", json_object_new_double(s.opacity)); - - // {"orientation", s.orientation}, - json_object_object_add(j, "orientation", json_object_new_int(s.orientation)); - - // }); - return j; -} - -json_object *to_json(compositor::screen const *s) -{ - auto o = json_object_new_object(); - json_object_object_add(o, "id", json_object_new_int(s->id)); - return o; -} - template <typename T> json_object *to_json_(T const &s) { @@ -93,11 +33,6 @@ json_object *to_json_(T const &s) return a; } -json_object *to_json(compositor::controller::props_map const &s) -{ - return to_json_(s); -} - json_object *to_json(std::vector<uint32_t> const &v) { auto a = json_object_new_array(); |