X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.hpp;h=4df650aa4df6b6e67aff08773db1f302e5b23720;hb=6aad766f32dcfcb81b0006248852845778d179a8;hp=7ead82e1f9e3d5d0f8f0add79a1e11fa0e814d24;hpb=5d5a780a405fdb71a85898d8d988f6ee1bf3b3e0;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/app.hpp b/src/app.hpp
index 7ead82e..4df650a 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -24,16 +24,14 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <experimental/optional>
-#include "config.hpp"
 #include "controller_hooks.hpp"
 #include "layers.hpp"
 #include "layout.hpp"
-#include "policy.hpp"
 #include "result.hpp"
 #include "wayland_ivi_wm.hpp"
 #include "hmi-debug.h"
 #include "request.hpp"
-#include "wm-error.h"
+#include "wm_error.hpp"
 
 namespace wl
 {
@@ -76,7 +74,6 @@ struct id_allocator
 
     // Surfaces that where requested but not yet created
     std::unordered_map<unsigned, std::string> id2name;
-    // std::unordered_set<unsigned> pending_surfaces;
     std::unordered_map<std::string, unsigned> name2id;
 
     id_allocator(id_allocator const &) = delete;
@@ -89,7 +86,6 @@ struct id_allocator
     {
         unsigned sid = this->next++;
         this->id2name[sid] = name;
-        // this->pending_surfaces.insert({sid});
         this->name2id[name] = sid;
         HMI_DEBUG("wm", "allocated new id %u with name %s", sid, name.c_str());
         return sid;
@@ -181,8 +177,6 @@ struct App
     std::unique_ptr<struct compositor::controller> controller;
     std::vector<std::unique_ptr<struct wl::output>> outputs;
 
-    struct config config;
-
     // track current layouts separately
     layer_map layers;
 
@@ -192,10 +186,6 @@ struct App
     // Set by AFB API when wayland events need to be dispatched
     std::atomic<bool> pending_events;
 
-    std::vector<int> pending_end_draw;
-
-    Policy policy;
-
     std::map<const char *, struct afb_event> map_afb_event;
 
     // Surface are info (x, y, w, h)
@@ -233,11 +223,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);
-    bool subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname);
 
   private:
     optional<int> lookup_id(char const *name);
@@ -245,46 +236,47 @@ struct App
 
     bool pop_pending_events();
 
-    void enqueue_flushdraw(int surface_id);
-    void check_flushdraw(int surface_id);
-
     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);
 
-    WMError 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 req_num);
-    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,
-                    struct LayoutState const &new_layout,
-                    std::function<void(LayoutState const &nl)> apply);
-
-    // The following function is temporary.
-    // Then will be removed when layermanager is finished
-    void lm_layout_change(const char *drawing_name);
-    WMError lm_layout_change(const struct WMAction &action);
-    WMError lm_release(const struct WMAction &action);
-    void lm_enddraw(const char *drawing_name);
+
+  private:
+    std::unordered_map<std::string, struct compositor::rect> area2size;
 };
 
 } // namespace wm