X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=WindowManager%2Fsrc%2Fwindowmanager.cpp;h=6ebe7043d56f8534f036a0ebbbca6ca376ab7dee;hb=430856118319fbaf784e4bfed6a6f2bf2f0bbea5;hp=c3080ffe549504ce6c8645c80a97e4ecd5e429d8;hpb=b0632b0a5cd7e31c79c4a81764ebed329114a983;p=staging%2FHomeScreen.git

diff --git a/WindowManager/src/windowmanager.cpp b/WindowManager/src/windowmanager.cpp
index c3080ff..6ebe704 100644
--- a/WindowManager/src/windowmanager.cpp
+++ b/WindowManager/src/windowmanager.cpp
@@ -47,17 +47,22 @@ WindowManager::WindowManager(QObject *parent) :
     mp_layoutAreaToSurfaceIdAssignment(0),
     m_currentLayout(-1),
     m_screenId(0), // use screen "0"
-    m_screenWidth(0),
-    m_screenHeight(0),
+#ifndef COMPIL_MAITAI
     m_appLayers(),
-    m_pending_to_show(-1)
+    m_pending_to_show(-1),
+#endif
+    m_screenWidth(0),
+    m_screenHeight(0)
+
 {
+#ifndef COMPIL_MAITAI
     m_showLayers = new t_ilm_layer[WINDOWMANAGER_LAYER_NUM];
 
     m_showLayers[0] = 0; /* POPUP is not shown by default */
     m_showLayers[1] = 0; /* HOMESCREEN_OVERLAY is not shown by default */
     m_showLayers[2] = 0; /* APPLICATIONS is not shown by default */
     m_showLayers[3] = WINDOWMANAGER_LAYER_HOMESCREEN; /* HOMESCREEN is shwon by default */
+#endif
 
     qDebug("-=[WindowManager]=-");
 }
@@ -107,6 +112,7 @@ WindowManager::~WindowManager()
     delete mp_layoutAreaToSurfaceIdAssignment;
 }
 
+#ifndef COMPIL_MAITAI
 int WindowManager::getLayerRenderOrder(t_ilm_layer id_array[])
 {
     int i, j;
@@ -119,6 +125,7 @@ int WindowManager::getLayerRenderOrder(t_ilm_layer id_array[])
 
     return j;
 }
+#endif
 
 void WindowManager::dumpScene()
 {
@@ -347,16 +354,17 @@ void WindowManager::updateScreen()
     ilm_layerSetRenderOrder(WINDOWMANAGER_LAYER_POPUP, pArray, length);
     ilm_commitChanges();
 #endif
+#ifndef COMPIL_MAITAI
     if (m_pending_to_show != -1) {
         showAppLayer(m_pending_to_show);
     } else {
         // display layer render order
         t_ilm_layer renderOrder[WINDOWMANAGER_LAYER_NUM];
         int num_layers = getLayerRenderOrder(renderOrder);
-        ilm_displaySetRenderOrder(0, renderOrder, num_layers);
-        ilm_displaySetRenderOrder(1, renderOrder, num_layers);
+        ilm_displaySetRenderOrder(m_screenId, renderOrder, num_layers);
         ilm_commitChanges();
     }
+#endif
 }
 
 #ifdef HAVE_IVI_LAYERMANAGEMENT_API
@@ -449,6 +457,7 @@ void WindowManager::surfaceCallbackFunction_non_static(t_ilm_surface surface,
     {
         qDebug("ILM_NOTIFICATION_CONTENT_AVAILABLE");
         /* add surface to layer for the application */
+
         ilmErrorTypes result;
         pid_t pid = surfaceProperties->creatorPid;
 
@@ -689,8 +698,7 @@ void WindowManager::hideLayer(int layer)
 
         t_ilm_layer renderOrder[WINDOWMANAGER_LAYER_NUM];
         int num_layers = getLayerRenderOrder(renderOrder);
-        ilm_displaySetRenderOrder(0, renderOrder, num_layers);
-        ilm_displaySetRenderOrder(1, renderOrder, num_layers);
+        ilm_displaySetRenderOrder(m_screenId, renderOrder, num_layers);
         ilm_commitChanges();
     }
 #endif
@@ -768,8 +776,7 @@ void WindowManager::showLayer(int layer)
 
         t_ilm_layer renderOrder[WINDOWMANAGER_LAYER_NUM];
         int num_layers = getLayerRenderOrder(renderOrder);
-        ilm_displaySetRenderOrder(0, renderOrder, num_layers);
-        ilm_displaySetRenderOrder(1, renderOrder, num_layers);
+        ilm_displaySetRenderOrder(m_screenId, renderOrder, num_layers);
         ilm_commitChanges();
     }
 #endif
@@ -786,7 +793,9 @@ void WindowManager::showAppLayer(int pid)
     }
 
     /* clear pending flag */
+#ifndef COMPIL_MAITAI
     m_pending_to_show = -1;
+#endif
 
 #ifdef HAVE_IVI_LAYERMANAGEMENT_API
     /* search layer id for application to show */
@@ -806,8 +815,7 @@ void WindowManager::showAppLayer(int pid)
     t_ilm_layer renderOrder[WINDOWMANAGER_LAYER_NUM];
 
     int num_layers = getLayerRenderOrder(renderOrder);
-    ilm_displaySetRenderOrder(0, renderOrder, num_layers);
-    ilm_displaySetRenderOrder(1, renderOrder, num_layers);
+    ilm_displaySetRenderOrder(m_screenId, renderOrder, num_layers);
     ilm_commitChanges();
 #endif
 }