Merge "set_role_pid_ver"

Change-Id: If982a22e72cee32c2d4d5445492526d3abb3ab69
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>

7 files changed, 201 insertions, 0 deletions

diff --git a/src/applist.cpp b/src/applist.cpp
index a5ae9f0..c083c20 100644
--- a/src/applist.cpp
+++ b/src/applist.cpp
@@ -172,6 +172,74 @@ string AppList::getAppID(unsigned surface, const string& role, bool* found) cons
     return string("");
 }
 
+WMError AppList::popFloatingSurface(unsigned pid, unsigned *surface)
+{
+    WMError ret = WMError::NO_ENTRY;
+
+    auto fwd_itr = std::remove_if(this->floating_surfaces.begin(), this->floating_surfaces.end(),
+                                    [pid, surface, &ret](FloatingSurface x) {
+                                        if(pid == x.pid){
+                                            *surface = x.surface_id;
+                                            ret = WMError::SUCCESS;
+                                            return true;
+                                        }
+                                        else{
+                                            return false;
+                                        }
+                                    });
+    if (fwd_itr != this->floating_surfaces.cend())
+    {
+        HMI_INFO("wm", "pop floating surface: %d", *surface);
+    }
+    this->floating_surfaces.erase(fwd_itr, this->floating_surfaces.end());
+    return ret;
+}
+
+// =================== Floating(Temporary) surface/client API ===================
+
+WMError AppList::popFloatingSurface(const std::string &appid, unsigned *surface)
+{
+    HMI_ERROR("wm", "This function is not implemented");
+    return WMError::SUCCESS;
+}
+
+void AppList::addFloatingClient(const std::string &appid, unsigned layer, const std::string &role)
+{
+}
+
+void AppList::addFloatingSurface(unsigned surface, unsigned pid)
+{
+    struct FloatingSurface fsurface{surface, pid};
+    this->floating_surfaces.push_back(fsurface);
+    this->dumpFloatingSurfaces();
+}
+
+void AppList::removeFloatingSurface(unsigned surface)
+{
+    this->dumpFloatingSurfaces();
+    auto fwd_itr = std::remove_if(this->floating_surfaces.begin(), this->floating_surfaces.end(),
+                                       [surface](FloatingSurface x) {
+                                           return x.surface_id == surface;
+                                       });
+    if(fwd_itr != this->floating_surfaces.cend()){
+        HMI_INFO("wm", "remove floating surface: %d", surface);
+    }
+    this->floating_surfaces.erase(fwd_itr, this->floating_surfaces.end());
+}
+
+WMError AppList::appendRole(const std::string &id, const std::string &role, unsigned surface)
+{
+    WMError wm_err = WMError::NO_ENTRY;
+    if (this->contains(id))
+    {
+        auto x = this->lookUpClient(id);
+        x->addSurface(role, surface);
+        wm_err = WMError::SUCCESS;
+    }
+    return wm_err;
+}
+
+
 // =================== Request Date container API ===================
 
 /**
@@ -523,4 +591,15 @@ void AppList::reqDump()
     }
     DUMP("======= req dump end =====");
 }
+
+void AppList::dumpFloatingSurfaces()
+{
+    DUMP("======= floating surface dump =====");
+    for (const auto &x : this->floating_surfaces)
+    {
+        DUMP("surface : %d, pid : %d", x.surface_id, x.pid);
+    }
+    DUMP("======= floating surface dump end =====\n");
+}
+
 } // namespace wm
diff --git a/src/applist.hpp b/src/applist.hpp
index a794b53..8c82e7a 100644
--- a/src/applist.hpp
+++ b/src/applist.hpp
@@ -31,6 +31,12 @@ namespace wm
 /* using std::experimental::nullopt;
 using std::experimental::optional; */
 
+struct FloatingSurface
+{
+    unsigned surface_id;
+    unsigned pid;
+};
+
 class AppList
 {
   public:
@@ -50,6 +56,14 @@ class AppList
     std::shared_ptr<WMClient> lookUpClient(const std::string &appid);
     void removeSurface(unsigned surface);
     std::string getAppID(unsigned surface, const std::string &role, bool *found) const;
+    WMError appendRole(const std::string &appid, const std::string &role, unsigned surface);
+
+    // Floating surface
+    void addFloatingClient(const std::string &appid, unsigned layer, const std::string &role);
+    void addFloatingSurface(unsigned surface, unsigned pid);
+    WMError popFloatingSurface(unsigned pid, unsigned *surface);
+    WMError popFloatingSurface(const std::string &appid, unsigned *surface);
+    void removeFloatingSurface(unsigned surface);
 
     // Request Interface
     unsigned currentRequestNumber() const;
@@ -69,12 +83,15 @@ class AppList
 
     void clientDump();
     void reqDump();
+    void dumpFloatingSurfaces();
 
   private:
     std::vector<WMRequest> req_list;
     std::unordered_map<std::string, std::shared_ptr<WMClient>> app2client;
     unsigned current_req;
     std::mutex mtx;
+    std::vector<struct FloatingSurface> floating_surfaces;
+    //std::vector<FloatingSurface> floating_clients;
 };
 
 } // namespace wm
diff --git a/src/controller_hooks.hpp b/src/controller_hooks.hpp
index f259089..601e9a8 100644
--- a/src/controller_hooks.hpp
+++ b/src/controller_hooks.hpp
@@ -35,6 +35,7 @@ struct controller_hooks
     void surface_removed(uint32_t surface_id);
     void surface_visibility(uint32_t surface_id, uint32_t v);
     void surface_destination_rectangle(uint32_t surface_id, uint32_t x, uint32_t y, uint32_t w, uint32_t h);
+    void surface_properties(uint32_t surface_id, uint32_t pid);
 };
 
 } // namespace wm
diff --git a/src/wayland_ivi_wm.cpp b/src/wayland_ivi_wm.cpp
index 75ecbbd..1e0082f 100644
--- a/src/wayland_ivi_wm.cpp
+++ b/src/wayland_ivi_wm.cpp
@@ -536,6 +536,14 @@ void controller::create_screen(struct wl_output *output)
     this->screen = std::make_unique<struct screen>(0, this, output);
 }
 
+void controller::get_surface_properties(uint32_t surface_id, int param)
+{
+    if(param == 0){
+        //param = IVI_WM_PARAM_OPACITY | IVI_WM_PARAM_VISIBILITY | IVI_WM_PARAM_SIZE;
+    }
+    ivi_wm_surface_get(this->proxy.get(), surface_id, param);
+}
+
 void controller::layer_created(uint32_t id)
 {
     HMI_DEBUG("wm", "compositor::controller @ %p layer %u (%x)", this->proxy.get(), id, id);
@@ -610,6 +618,7 @@ void controller::surface_stats_received(struct surface *s, uint32_t surface_id,
 {
     HMI_DEBUG("wm", "compositor::surface %s @ %d f %u pid %u",
               __func__, surface_id, frame_count, pid);
+    this->chooks->surface_properties(surface_id, pid);
 }
 
 void controller::surface_created(uint32_t id)
diff --git a/src/wayland_ivi_wm.hpp b/src/wayland_ivi_wm.hpp
index 06c1e1b..cba5556 100644
--- a/src/wayland_ivi_wm.hpp
+++ b/src/wayland_ivi_wm.hpp
@@ -166,6 +166,7 @@ struct surface_properties
     int32_t orientation;
     int32_t visibility;
     float opacity;
+    uint32_t pid;
 };
 
 /**
@@ -290,6 +291,7 @@ struct controller : public wayland_proxy<struct ivi_wm>
     void layer_create(uint32_t id, int32_t w, int32_t h);
     void surface_create(uint32_t id);
     void create_screen(struct wl_output *output);
+    void get_surface_properties(uint32_t surface_id, int param = 0);
 
     // Events
     void surface_visibility_changed(struct surface *s, int32_t visibility);
diff --git a/src/window_manager.cpp b/src/window_manager.cpp
index b35c767..8a75f4b 100644
--- a/src/window_manager.cpp
+++ b/src/window_manager.cpp
@@ -342,6 +342,98 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr
     return nullptr;
 }
 
+/**
+ * This function is substitute of requestSurface
+ * If surface creation is faster than application request of this function,
+ * WM will bind surfaceID with application and role.
+ * If surface creation is slower than application request of thie function,
+ * WM will put Client into pending list.
+ *
+ * Note :
+ * Application can request with pid but this is temporary solution for now.
+ * This will be removed.
+ * */
+bool WindowManager::api_set_role(char const *appid, char const *drawing_name, unsigned pid){
+    std::string id = appid;
+    std::string role = drawing_name;
+    unsigned surface = 0;
+    WMError wm_err = WMError::UNKNOWN;
+    bool ret = false;
+
+    // get layer ID which role should be in
+    auto lid = this->layers.get_layer_id(role);
+    if (!lid)
+    {
+        /**
+       * register drawing_name as fallback and make it displayed.
+       */
+        lid = this->layers.get_layer_id(std::string("fallback"));
+        HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", role.c_str());
+        if (!lid)
+        {
+            HMI_ERROR("wm", "Drawing name does not match any role, fallback is disabled");
+            return ret;
+        }
+    }
+
+    if(0 != pid){
+        // search floating surfaceID from pid if pid is designated.
+        // It is not good that application request with its pid
+        wm_err = g_app_list.popFloatingSurface(pid, &surface);
+    }
+    else{
+        // get floating surface with appid. If WM queries appid from pid,
+        // WM can bind surface and role with appid(not implemented yet)
+        //wm_err = g_app_list.popFloatingSurface(id);
+    }
+    if(wm_err != WMError::SUCCESS){
+        HMI_ERROR("wm", "No floating surface for app: %s", id.c_str());
+        g_app_list.addFloatingClient(id, *lid, role);
+        HMI_NOTICE("wm", "%s : Waiting for surface creation", id.c_str());
+        return ret;
+    }
+
+    ret = true;
+    if (g_app_list.contains(id))
+    {
+        HMI_INFO("wm", "Add role: %s with surface: %d. Client %s has multi surfaces.",
+                 role.c_str(), surface, id.c_str());
+        wm_err = g_app_list.appendRole(id, role, surface);
+        if(wm_err != WMError::SUCCESS){
+            HMI_INFO("wm", errorDescription(wm_err));
+        }
+    }
+    else{
+        HMI_INFO("wm", "Create new client: %s, surface: %d into layer: %d with role: %s",
+                 id.c_str(), surface, *lid, role.c_str());
+        g_app_list.addClient(id, *lid, surface, role);
+    }
+
+    // register pair drawing_name and ivi_id
+    this->id_alloc.register_name_id(role.c_str(), surface);
+    this->layers.add_surface(surface, *lid);
+
+    // this surface is already created
+    HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", surface, *lid);
+
+    const auto &o_layer = this->layers.get_layer(*lid);
+    auto rect = o_layer.value().rect;
+    if(rect.w < 0)
+    {
+        rect.w = this->controller->output_size.w + 1 + rect.w;
+    }
+    if(rect.h < 0)
+    {
+        rect.h = this->controller->output_size.h + 1 + rect.h;
+    }
+    this->controller->surfaces[surface]->set_source_rectangle(0, 0, rect.w, rect.h);
+
+    this->controller->layers[*lid]->add_surface(surface);
+    this->layout_commit();
+
+    return ret;
+}
+
 void WindowManager::api_activate_surface(char const *appid, char const *drawing_name,
                                char const *drawing_area, const reply_func &reply)
 {
diff --git a/src/window_manager.hpp b/src/window_manager.hpp
index 1237a60..717b947 100644
--- a/src/window_manager.hpp
+++ b/src/window_manager.hpp
@@ -211,6 +211,7 @@ class WindowManager
 
     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);
+    bool api_set_role(char const *appid, char const *drawing_name, unsigned pid);
     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);