X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fapp.hpp;h=a6608e0d3961dfe3dee7532a45f2073ced80ee2e;hb=c4d50e105fd1204bdf6cac88300d667c1af3d682;hp=7782e0467d9ae4b736fa2f70ee955a2bea7994ea;hpb=f985291576affb4a2054e81ed34e7ff57ea50922;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/app.hpp b/src/app.hpp
index 7782e04..a6608e0 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -33,6 +33,7 @@
 #include "wayland_ivi_wm.hpp"
 #include "hmi-debug.h"
 #include "request.hpp"
+#include "wm_error.hpp"
 
 namespace wl
 {
@@ -158,7 +159,9 @@ struct App
         Event_SyncDraw,
         Event_FlushDraw,
 
-        Event_Val_Max = Event_FlushDraw,
+        Event_Error,
+
+        Event_Val_Max = Event_Error,
     };
 
     const std::vector<const char *> kListEventName{
@@ -167,7 +170,8 @@ struct App
         "visible",
         "invisible",
         "syncdraw",
-        "flushdraw"};
+        "flushdraw",
+        "error"};
 
     struct controller_hooks chooks;
 
@@ -229,10 +233,12 @@ struct App
     void surface_created(uint32_t surface_id);
     void surface_removed(uint32_t surface_id);
 
+    void removeClient(const std::string &appid);
+    void exeptionProcessForTransition();
+    bool subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname);
     // Do not use this function
     //static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata);
     void timerHandler();
-    void removeClient(const std::string &appid);
 
   private:
     optional<int> lookup_id(char const *name);
@@ -245,29 +251,41 @@ struct App
 
     int init_layers();
 
-    void surface_set_layout(int surface_id, optional<int> sub_surface_id = nullopt);
+    void surface_set_layout(int surface_id, const std::string& area = "");
     void layout_commit();
 
     // TMC WM Events to clients
     void emit_activated(char const *label);
     void emit_deactivated(char const *label);
     void emit_syncdraw(char const *label, char const *area, int x, int y, int w, int h);
+    void emit_syncdraw(const std::string &role, const std::string &area);
     void emit_flushdraw(char const *label);
     void emit_visible(char const *label, bool is_visible);
     void emit_invisible(char const *label);
     void emit_visible(char const *label);
 
-    bool do_transition(unsigned sequence_number);
+    WMError setRequest(const std::string &appid, const std::string &role, const std::string &area,
+                             Task task, unsigned *req_num);
+    WMError doTransition(unsigned sequence_number);
+    WMError checkPolicy(unsigned req_num);
+    WMError startTransition(unsigned req_num);
+    WMError setInvisibleTask(const std::string &role, bool split);
+
+    WMError doEndDraw(unsigned req_num);
+    WMError layoutChange(const WMAction &action);
+    WMError visibilityChange(const WMAction &action);
+    WMError setSurfaceSize(unsigned surface, const std::string& area);
+    WMError changeCurrentState(unsigned req_num);
+
+    void
+    setTimer();
+    void stopTimer();
+    void processNextRequest();
 
-    void do_enddraw(unsigned sequence_number);
-    void process_request();
-    void set_timer();
-    void stop_timer();
     const char *check_surface_exist(const char *drawing_name);
 
     void activate(int id);
     void deactivate(int id);
-    void deactivate_main_surface();
 
     bool can_split(struct LayoutState const &state, int new_id);
     void try_layout(struct LayoutState &state,
@@ -276,10 +294,10 @@ struct App
 
     // The following function is temporary.
     // Then will be removed when layermanager is finished
-    void lm_layout_change(const char *drawing_name);
-    bool lm_layout_change(const struct WMAction &action);
-    bool lm_release(const struct WMAction &action);
-    void lm_enddraw(const char *drawing_name);
+    WMError lm_release(const struct WMAction &action);
+
+  private:
+    std::unordered_map<std::string, struct compositor::rect> area2size;
 };
 
 } // namespace wm