diff options
author | Kazumasa Mitsunari <knimitz@witz-inc.co.jp> | 2017-10-23 15:28:32 +0900 |
---|---|---|
committer | Kazumasa Mitsunari <knimitz@witz-inc.co.jp> | 2017-11-01 19:39:30 +0900 |
commit | 7d1bce363c39ac0463caa90498473059110fe91b (patch) | |
tree | 26269161a6326631436569ef2e1968a9193b85cf /src/libwindowmanager.h | |
parent | c986011039cbb77171486d4b916c888f390cfbe2 (diff) |
Change parameter from char* to json_object
For future extensibility, change the argument parameter to json_object
Bug-AGL: SPEC-990
Conflicts:
src/libwindowmanager.cpp
Change-Id: I7015fe26d22489f250b67907870d2863d1e8158b
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
Diffstat (limited to 'src/libwindowmanager.h')
-rw-r--r-- | src/libwindowmanager.h | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/libwindowmanager.h b/src/libwindowmanager.h index 6c13763..5bc97de 100644 --- a/src/libwindowmanager.h +++ b/src/libwindowmanager.h @@ -18,6 +18,7 @@ #define LIBWINDOWMANAGER_H #include <functional> +#include <json-c/json.h> class LibWindowmanager { public: @@ -27,7 +28,18 @@ public: LibWindowmanager(const LibWindowmanager &) = delete; LibWindowmanager &operator=(const LibWindowmanager &) = delete; - using handler_fun = std::function<void(const char *)>; + using handler_fun = std::function<void(json_object *)>; + + /* DrawingArea name (usage: {layout}.{area}) */ + const std::string kStrLayoutNormal = "normal"; + const std::string kStrLayoutSplit = "split"; + const std::string kStrAreaFull = "full"; + const std::string kStrAreaMain = "main"; + const std::string kStrAreaSub = "sub"; + + /* Key for json obejct */ + constexpr static char *kKeyDrawingName = "drawing_name"; + constexpr static char *kKeyDrawingArea = "drawing_area"; enum EventType { Event_Active = 1, @@ -43,10 +55,10 @@ public: int init(int port, char const *token); // WM API - int requestSurface(const char *label); - int activateSurface(const char *label); - int deactivateSurface(const char *label); - int endDraw(const char *label); + int requestSurface(json_object *object); + int activateSurface(json_object *object); + int deactivateSurface(json_object *object); + int endDraw(json_object *object); void set_event_handler(enum EventType et, handler_fun f); |