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

diff --git a/src/app.hpp b/src/app.hpp
index 04caf12..4df650a 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -24,11 +24,9 @@
 #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"
@@ -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)
@@ -234,6 +224,7 @@ struct App
     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);
@@ -245,12 +236,9 @@ 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
@@ -276,8 +264,7 @@ struct App
     WMError setSurfaceSize(unsigned surface, const std::string& area);
     WMError changeCurrentState(unsigned req_num);
 
-    void
-    setTimer();
+    void setTimer();
     void stopTimer();
     void processNextRequest();
 
@@ -285,16 +272,8 @@ struct App
 
     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
-    WMError lm_release(const struct WMAction &action);
 
   private:
     std::unordered_map<std::string, struct compositor::rect> area2size;