Improve output of multiple screen resolution

[apps/agl-service-windowmanager-2017.git] / src / window_manager.hpp

diff --git a/src/window_manager.hpp b/src/window_manager.hpp
index b5b1c4d..2358c5a 100644 (file)
--- a/src/window_manager.hpp
+++ b/src/window_manager.hpp
@@ -17,7 +17,6 @@
 #ifndef TMCAGLWM_APP_HPP
 #define TMCAGLWM_APP_HPP
 
-#include <json-c/json.h>
 #include <atomic>
 #include <memory>
 #include <unordered_map>
@@ -30,6 +29,8 @@
 #include "request.hpp"
 #include "wm_error.hpp"
 
+struct json_object;
+
 namespace wl
 {
 struct display;
@@ -64,6 +65,7 @@ extern const char kKeyWidthPixel[];
 extern const char kKeyHeightPixel[];
 extern const char kKeyWidthMm[];
 extern const char kKeyHeightMm[];
+extern const char kKeyScale[];
 extern const char kKeyIds[];
 
 struct id_allocator
@@ -165,9 +167,9 @@ class WindowManager
         "inactive",
         "visible",
         "invisible",
-        "syncdraw",
-        "flushdraw",
-        "screen_updated",
+        "syncDraw",
+        "flushDraw",
+        "screenUpdated",
         "error"};
 
     struct controller_hooks chooks;
@@ -207,13 +209,13 @@ class WindowManager
     int dispatch_pending_events();
     void set_pending_events();
 
-    result<int> api_request_surface(char const *appid, char const *drawing_name);
-    char const *api_request_surface(char const *appid, char const *drawing_name, char const *ivi_id);
-    void api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply);
-    void api_deactivate_surface(char const *appid, char const *drawing_name, const reply_func &reply);
-    void api_enddraw(char const *appid, char const *drawing_name);
+    result<int> api_request_surface(char const *appid, char const *role);
+    char const *api_request_surface(char const *appid, char const *role, char const *ivi_id);
+    void api_activate_surface(char const *appid, char const *role, char const *drawing_area, const reply_func &reply);
+    void api_deactivate_surface(char const *appid, char const *role, const reply_func &reply);
+    void api_enddraw(char const *appid, char const *role);
     result<json_object *> api_get_display_info();
-    result<json_object *> api_get_area_info(char const *drawing_name);
+    result<json_object *> api_get_area_info(char const *role);
     void api_ping();
     void send_event(char const *evname, char const *label);
     void send_event(char const *evname, char const *label, char const *area, int x, int y, int w, int h);
@@ -224,6 +226,7 @@ class WindowManager
 
     void removeClient(const std::string &appid);
     void exceptionProcessForTransition();
+    const char* convertRoleOldToNew(char const *role);
     // Do not use this function
     void timerHandler();
 
@@ -265,12 +268,18 @@ class WindowManager
     void stopTimer();
     void processNextRequest();
 
-    const char *check_surface_exist(const char *drawing_name);
+    int loadOldRoleDb();
+
+    const char *check_surface_exist(const char *role);
 
     bool can_split(struct LayoutState const &state, int new_id);
 
   private:
     std::unordered_map<std::string, struct compositor::rect> area2size;
+    std::unordered_map<std::string, std::string> roleold2new;
+    std::unordered_map<std::string, std::string> rolenew2old;
+
+    static const char* kDefaultOldRoleDb;
 };
 
 } // namespace wm