X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwindow_manager.hpp;h=2358c5af3eb7c9b9409458df8977a80bc024cdd8;hb=a79b572a5f26d6ecdd97dff159c40bad330e1c4c;hp=ea4d56e5b3ad073289b96e7629d7fba369467d79;hpb=0f058700e7a34d75ae929088a31055b7efd0e456;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/window_manager.hpp b/src/window_manager.hpp
index ea4d56e..2358c5a 100644
--- 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,8 @@ 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
 {
@@ -152,6 +155,8 @@ class WindowManager
         Event_SyncDraw,
         Event_FlushDraw,
 
+        Event_ScreenUpdated,
+
         Event_Error,
 
         Event_Val_Max = Event_Error,
@@ -162,8 +167,9 @@ class WindowManager
         "inactive",
         "visible",
         "invisible",
-        "syncdraw",
-        "flushdraw",
+        "syncDraw",
+        "flushDraw",
+        "screenUpdated",
         "error"};
 
     struct controller_hooks chooks;
@@ -203,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);
@@ -220,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();
 
@@ -241,6 +248,8 @@ class WindowManager
     void emit_invisible(char const *label);
     void emit_visible(char const *label);
 
+    void activate(int id);
+    void deactivate(int id);
     WMError setRequest(const std::string &appid, const std::string &role, const std::string &area,
                              Task task, unsigned *req_num);
     WMError doTransition(unsigned sequence_number);
@@ -253,18 +262,24 @@ class WindowManager
     WMError visibilityChange(const WMAction &action);
     WMError setSurfaceSize(unsigned surface, const std::string& area);
     WMError changeCurrentState(unsigned req_num);
+    void    emitScreenUpdated(unsigned req_num);
 
     void setTimer();
     void stopTimer();
     void processNextRequest();
 
-    const char *check_surface_exist(const char *drawing_name);
-    void activate(int id);
-    void deactivate(int id);
+    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