X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=debbcbd3e48c62950402eba36047af955f4e6597;hb=refs%2Fheads%2Fsandbox%2Fknimitz%2Fset_role_pid_ver;hp=41b52c43326cece9966c3968b037838243a0269a;hpb=ce0587201398f8704f8c8a9d5d4c96b3aafd476f;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/app.cpp b/src/app.cpp
index 41b52c4..debbcbd 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "applist.hpp"
 #include "app.hpp"
 #include "json_helper.hpp"
 #include "layers.hpp"
@@ -35,8 +36,8 @@
 #include <regex>
 #include <thread>
 
-#include "wm-client.hpp"
-#include "applist.hpp"
+#include "wm_client.hpp"
+
 
 extern "C"
 {
@@ -161,6 +162,8 @@ App::App(wl::display *d)
       id_alloc{},
       pending_events(false),
       policy{}
+      //g_app_list(new AppList())
+      //g_app_list(std::make_unique<AppList>())
 {
     try
     {
@@ -238,6 +241,8 @@ int App::init()
     return init_layers();
 }
 
+App::~App() = default;
+
 int App::dispatch_pending_events()
 {
     if (this->pop_pending_events())
@@ -572,8 +577,15 @@ WMError App::do_transition(unsigned req_num)
     * Check Policy
     */
     // get current trigger
-    auto trigger = g_app_list.getRequest(req_num);
+    bool found;
     bool is_activate = true;
+    auto trigger = g_app_list.getRequest(req_num, &found);
+    if(!found)
+    {
+        WMError err = WMError::NO_ENTRY;
+        HMI_SEQ_ERROR(req_num, errorDescription(err));
+        return err;
+    }
 
     /*  get new status from Policy Manager
 
@@ -606,8 +618,14 @@ WMError App::do_transition(unsigned req_num)
 
     // layer manager task
     bool sync_draw_happen = false;
-    for (const auto &y : g_app_list.getActions(req_num))
+    for (const auto &y : g_app_list.getActions(req_num, &found))
     {
+        if (!found)
+        {
+            WMError err = WMError::NO_ENTRY;
+            HMI_SEQ_ERROR(req_num, "%s : Action is not set", errorDescription(err));
+            return err;
+        }
         /*
         do_task(y);
         */
@@ -870,6 +888,14 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char
 
     auto client = g_app_list.lookUpClient(id);
 
+    unsigned srfc = client->surfaceID(role);
+    if(srfc == INVALID_SURFACE_ID){
+        HMI_ERROR("wm", "role should be set with surface");
+        reply("role should be set with surface");
+        return;
+    }
+    g_app_list.removeFloatingSurface(client->surfaceID(role));
+
     /*
    * Queueing Phase
    */
@@ -1006,7 +1032,15 @@ void App::lm_enddraw(const char *drawing_name)
 void App::do_enddraw(unsigned req_num)
 {
     // get actions
-    auto actions = g_app_list.getActions(req_num);
+    bool found;
+    auto actions = g_app_list.getActions(req_num, &found);
+    if (!found)
+    {
+        WMError err = WMError::NO_ENTRY;
+        HMI_SEQ_ERROR(req_num, errorDescription(err));
+        return;
+    }
+
     HMI_SEQ_INFO(req_num, "do endDraw");
 
     for (const auto &act : actions)
@@ -1115,6 +1149,10 @@ void App::send_event(char const *evname, char const *label, char const *area,
  */
 void App::surface_created(uint32_t surface_id)
 {
+    // For set role function
+    HMI_DEBUG("wm", "Get surface pid");
+    this->controller->get_surface_properties(surface_id);
+
     auto layer_id = this->layers.get_layer_id(surface_id);
     if (!layer_id)
     {
@@ -1127,6 +1165,7 @@ void App::surface_created(uint32_t surface_id)
 
     this->controller->layers[*layer_id]->add_surface(surface_id);
     this->layout_commit();
+
     // activate the main_surface right away
     /*if (surface_id == static_cast<unsigned>(this->layers.main_surface)) {
       HMI_DEBUG("wm", "Activating main_surface (%d)", surface_id);
@@ -1149,6 +1188,12 @@ void App::surface_removed(uint32_t surface_id)
     g_app_list.removeSurface(surface_id);
 }
 
+void App::surface_properties(unsigned surface_id, unsigned pid)
+{
+    HMI_DEBUG("wm", "get surface properties");
+    g_app_list.addFloatingSurface(surface_id, pid);
+}
+
 void App::emit_activated(char const *label)
 {
     this->send_event(kListEventName[Event_Active], label);
@@ -1266,9 +1311,96 @@ char const *App::api_request_surface(char const *appid, char const *drawing_name
     return nullptr;
 }
 
-void App::api_set_role(char const *appid, char const *drawing_name, unsigned pid){
+/**
+ * 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 App::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;
 }
 
 result<json_object *> App::api_get_display_info()
@@ -1495,6 +1627,11 @@ void controller_hooks::surface_removed(uint32_t surface_id)
     this->app->surface_removed(surface_id);
 }
 
+void controller_hooks::surface_properties(uint32_t surface_id, uint32_t pid)
+{
+    this->app->surface_properties(surface_id, pid);
+}
+
 void controller_hooks::surface_visibility(uint32_t /*surface_id*/,
                                           uint32_t /*v*/) {}