Change struct WMAction

[apps/agl-service-windowmanager.git] / src / window_manager.cpp

diff --git a/src/window_manager.cpp b/src/window_manager.cpp
index cb45acd..fc333d4 100644 (file)
--- a/src/window_manager.cpp
+++ b/src/window_manager.cpp
@@ -818,6 +818,7 @@ void WindowManager::timerHandler()
 void WindowManager::startTransitionWrapper(vector<WMAction> &actions)
 {
     WMError ret;
+    // req_num is guaranteed by Window Manager
     unsigned req_num = g_app_list.currentRequestNumber();
 
     if (actions.empty())
@@ -855,7 +856,9 @@ void WindowManager::startTransitionWrapper(vector<WMAction> &actions)
                     goto error;
                 }
             }
-            act.appid = appid;
+            auto client = g_app_list.lookUpClient(appid);
+            act.req_num = req_num;
+            act.client = client;
         }
 
         ret = g_app_list.setAction(req_num, act);
@@ -1290,12 +1293,14 @@ WMError WindowManager::startTransition(unsigned req_num)
         // Make it deactivate here
         for (const auto &x : actions)
         {
-            if (g_app_list.contains(x.appid))
+            this->lc->visibilityChange(x);
+            /* if (g_app_list.contains(x.appid))
             {
                 auto client = g_app_list.lookUpClient(x.appid);
-                this->deactivate(client->surfaceID(x.role));
-            }
+                //this->deactivate(client->surfaceID(x.role));
+            } */
         }
+        this->lc->commitChange();
         ret = WMError::NO_LAYOUT_CHANGE;
     }
     return ret;
@@ -1321,9 +1326,6 @@ WMError WindowManager::doEndDraw(unsigned req_num)
         if(act.visible != TaskVisible::NO_CHANGE)
         {
             // layout change
-            if(!g_app_list.contains(act.appid)){
-                ret = WMError::NOT_REGISTERED;
-            }
             ret = this->lc->layoutChange(act);
             if(ret != WMError::SUCCESS)
             {
@@ -1368,7 +1370,8 @@ WMError WindowManager::layoutChange(const WMAction &action)
         // Visibility is not change -> no redraw is required
         return WMError::SUCCESS;
     }
-    auto client = g_app_list.lookUpClient(action.appid);
+    WMError ret = this->lc->layoutChange(action);
+    /* auto client = g_app_list.lookUpClient(action.appid);
     unsigned surface = client->surfaceID(action.role);
     if (surface == 0)
     {
@@ -1377,14 +1380,14 @@ WMError WindowManager::layoutChange(const WMAction &action)
         return WMError::NOT_REGISTERED;
     }
     // Layout Manager
-    WMError ret = this->setSurfaceSize(surface, action.area);
+    WMError ret = this->setSurfaceSize(surface, action.area); */
     return ret;
 }
 
 WMError WindowManager::visibilityChange(const WMAction &action)
 {
     HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Change visibility");
-    if(!g_app_list.contains(action.appid)){
+    /* if(!g_app_list.contains(action.appid)){
         return WMError::NOT_REGISTERED;
     }
     auto client = g_app_list.lookUpClient(action.appid);
@@ -1394,17 +1397,18 @@ WMError WindowManager::visibilityChange(const WMAction &action)
         HMI_SEQ_ERROR(g_app_list.currentRequestNumber(),
                       "client doesn't have surface with role(%s)", action.role.c_str());
         return WMError::NOT_REGISTERED;
-    }
+    } */
+    WMError ret = this->lc->visibilityChange(action);
 
-    if (action.visible != TaskVisible::INVISIBLE)
+/*     if (action.visible != TaskVisible::INVISIBLE)
     {
         this->activate(surface); // Layout Manager task
     }
     else
     {
         this->deactivate(surface); // Layout Manager task
-    }
-    return WMError::SUCCESS;
+    } */
+    return ret;
 }
 
 WMError WindowManager::setSurfaceSize(unsigned surface, const string &area)
@@ -1429,7 +1433,7 @@ void WindowManager::emitScreenUpdated(unsigned req_num)
     {
         if(action.visible != TaskVisible::INVISIBLE)
         {
-            json_object_array_add(jarray, json_object_new_string(action.appid.c_str()));
+            json_object_array_add(jarray, json_object_new_string(action.client->appID().c_str()));
         }
     }
     json_object_object_add(j, kKeyIds, jarray);