From 7d1bce363c39ac0463caa90498473059110fe91b Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Mon, 23 Oct 2017 15:28:32 +0900 Subject: 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 --- src/libwindowmanager.h | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'src/libwindowmanager.h') 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 +#include class LibWindowmanager { public: @@ -27,7 +28,18 @@ public: LibWindowmanager(const LibWindowmanager &) = delete; LibWindowmanager &operator=(const LibWindowmanager &) = delete; - using handler_fun = std::function; + using handler_fun = std::function; + + /* 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); -- cgit 1.2.3-korg