I replace the file with the correct one.

Change-Id: I2a173e09e992359e489696c11ecd14ef7cfefd63
Signed-off-by: Hayato Nakamura <hayato.nakamura@mail.toyota-td.jp>

diff --git a/src/ico_window_mgr.c b/src/ico_window_mgr.c
index 0e6c811..ada2f62 100644 (file)
--- a/src/ico_window_mgr.c
+++ b/src/ico_window_mgr.c
@@ -1471,9 +1471,11 @@ uifw_declare_manager(struct wl_client *client, struct wl_resource *resource, int
 
 /*--------------------------------------------------------------------------*/
 /**
- * @brief   win_mgr_set_layer: set(or change) surface layer
+ * @brief   uifw_set_window_layer: set layer id to surface
  *
- * @param[in]   usurf       UIFW surface
+ * @param[in]   client      Weyland client
+ * @param[in]   resource    resource of request
+ * @param[in]   surfaceid   UIFW surface id
  * @param[in]   layer       layer id
  * @return      none
  */
@@ -1482,8 +1484,8 @@ static void
 uifw_set_window_layer(struct wl_client *client, struct wl_resource *resource,
                       uint32_t surfaceid, uint32_t layer)
 {
-    struct uifw_win_layer *el;
-    struct uifw_win_layer *new_el;
+    uifw_trace("uifw_set_window_layer: Enter res=%08x surfaceid=%08x layer=%d",
+               (int)resource, surfaceid, layer);
 
     struct uifw_win_surface *usurf = ico_window_mgr_get_usurf_client(surfaceid, client);
 
@@ -1496,28 +1498,7 @@ uifw_set_window_layer(struct wl_client *client, struct wl_resource *resource,
 
         win_mgr_change_surface(usurf->surface, -1, 1);
     }
-
-    if (&el->link == &_ico_win_mgr->ivi_layer_list)    {
-        /* layer not exist, create new layer    */
-        uifw_trace("win_mgr_set_layer: New Layer %d", layer);
-        new_el = win_mgr_create_layer(usurf, layer);
-        if (! new_el)   {
-            uifw_trace("win_mgr_set_layer: Leave(No Memory)");
-            return;
-        }
-    }
-    else    {
-        uifw_trace("win_mgr_set_layer: Add surface to Layer %d", layer);
-        wl_list_remove(&usurf->ivi_layer);
-        wl_list_insert(&el->surface_list, &usurf->ivi_layer);
-        usurf->win_layer = el;
-    }
-
-    /* rebild compositor surface list       */
-    if (usurf->visible) {
-        ico_window_mgr_restack_layer(usurf, 0);
-    }
-    uifw_trace("win_mgr_set_layer: Leave");
+    uifw_trace("uifw_set_window_layer: Leave");
 }
 
 /*--------------------------------------------------------------------------*/

diff --git a/tests/testdata/hs_animatest.dat.ORG b/tests/testdata/hs_animatest.dat.ORG
deleted file mode 100644 (file)
index dfaf0af..0000000
--- a/tests/testdata/hs_animatest.dat.ORG
+++ /dev/null
@@ -1,101 +0,0 @@
-#      Test for Weston IVI Plugin for HomeScreen(SystemController)
-#      Animation Test
-#
-#      1. Surface animation
-sleep 1
-launch ../tests/test-client < ../tests/testdata/cl_surface4.dat 2> ../tests/testlog/test-client04.log
-waitcreate 2
-resize test-client 200 300
-move test-client 300 350 0
-#
-# fade and show/hide
-animation test-client fade 400
-#
-show test-client 1
-sleep 0.5
-hide test-client 1
-sleep 1
-#
-# slide.toleft and show/hide
-animation test-client slide.toleft 400
-show test-client 1
-sleep 1
-hide test-client 1
-sleep 2
-#
-# slide.toright and show/hide
-animation test-client slide.toright 400
-show test-client 1
-sleep 2
-hide test-client 1
-sleep 2
-#
-# slide.totop and show/hide
-animation test-client slide.totop 400
-show test-client 1
-sleep 1
-hide test-client 1
-sleep 2
-#
-# slide.tobottom and show/hide
-animation test-client slide.tobottom 400
-show test-client 1
-sleep 1
-hide test-client 1
-sleep 2
-#
-# zoom and show/hide
-show test-client
-sleep 1
-animation test-client zoom 600
-show test-client 1
-sleep 2
-hide test-client 1
-sleep 2
-#
-# zoom and move
-animation test-client zoom 1000
-show test-client
-sleep 1
-move test-client 100 50 0 1
-sleep 2
-move test-client 500 400 0 1
-sleep 2
-#
-# zoom and resize
-resize test-client 80 50 1
-sleep 2
-resize test-client 300 200 1
-sleep 2
-#
-# slide and move
-animation test-client slide 600
-move test-client 100 50 0 1
-sleep 1.5
-move test-client 500 400 0 1
-sleep 2
-#
-# fade and resize
-animation test-client fade 600
-resize test-client 80 50 1
-sleep 1.5
-resize test-client 300 200 1
-sleep 2
-#
-# slide and resize
-animation test-client slide 600
-resize test-client 80 50 1
-sleep 1.5
-resize test-client 300 200 1
-sleep 3
-#
-#
-waitdestroy 60
-sleep 1
-#
-kill test-client
-sleep 0.5
-#
-#      2. End of Test
-bye
-

diff --git a/tests/weston-plugin-test.vanima b/tests/weston-plugin-test.vanima
deleted file mode 100755 (executable)
index fd7cdef..0000000
--- a/tests/weston-plugin-test.vanima
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-#
-#      Weston IVI Plugin Test
-#
-#        Remark: This examination premises that Weston does not run.
-
-# 1 Delete log file
-mkdir ../tests/testlog 2> /dev/null
-rm -fr ../tests/testlog/* 2> /dev/null
-
-# 2 Start Pseudo event device (for Touch Panel)
-../tests/test-send_event -d -mq=5551 2> ../tests/testlog/event_log.log 1>&2 &
-sleep 1
-
-# 3 Weston/Wayland Envionment
-export QT_QPA_PLATFORM=wayland
-export ELM_ENGINE=wayland_shm
-export ECORE_EVAS_ENGINE=wayland_shm
-export XDG_RUNTIME_DIR=/run/user/5000
-
-# 4 Set Environment for Test
-export WESTON_IVI_PLUGIN_DIR="../src/.libs"
-
-# 5 Start Weston
-export XDG_CONFIG_HOME="../tests"
-MOD_DIR="$PWD/../src/.libs"
-/usr/bin/weston --backend=fbdev-backend.so --modules=$MOD_DIR/ico_plugin_loader.so --idle-time=0 --log=../tests/testlog/weston.log &
-sleep 1
-
-# 6 Set library path
-export LD_LIBRARY_PATH=../src/.libs:$LD_LIBRARY_PATH
-
-# 7 Start test-homescreen
-../tests/test-homescreen < ../tests/testdata/hs_animatest.dat 2> ../tests/testlog/test-homescreen.log
-
-# 8 End of Test
-sleep 2
-/usr/bin/killall weston
-/usr/bin/killall test-send_event
-sleep 1
-
-# 9 Check Error
-FOUND_ERR=0
-/bin/grep "ERR>" testlog/*
-if [ "$?" != "1" ] ; then
-       FOUND_ERR=1
-fi
-/bin/grep "WRN>" testlog/*
-if [ "$?" != "1" ] ; then
-       FOUND_ERR=1
-fi
-/bin/grep "Error" testlog/*
-if [ "$?" != "1" ] ; then
-       FOUND_ERR=1
-fi
-/bin/grep "error" testlog/* | /bin/grep -v "error_but_no_problem_for_test"
-if [ "$?" != "1" ] ; then
-       FOUND_ERR=1
-fi
-/bin/grep "Fail" testlog/* | /bin/grep -v "error_but_no_problem_for_test" | /bin/grep -v "initialize backlight"
-if [ "$?" != "1" ] ; then
-       FOUND_ERR=1
-fi
-
-if [ $FOUND_ERR = 0 ] ; then
-       echo "Weston IVI Plugin Test: OK"
-else
-       echo "Weston IVI Plugin Test: ERROR"
-fi
-

diff --git a/tests/weston-plugin-test.vbox b/tests/weston-plugin-test.vbox
deleted file mode 100755 (executable)
index 7d876d5..0000000
--- a/tests/weston-plugin-test.vbox
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-#
-#      Weston IVI Plugin Test
-#
-#        Remark: This examination premises that Weston does not run.
-
-# 1 Delete log file
-mkdir ../tests/testlog 2> /dev/null
-rm -fr ../tests/testlog/* 2> /dev/null
-
-# 2 Start Pseudo event device (for Touch Panel)
-../tests/test-send_event -d -mq=5551 2> ../tests/testlog/event_log.log 1>&2 &
-sleep 1
-
-# 3 Weston/Wayland Envionment
-export QT_QPA_PLATFORM=wayland
-#export ELM_ENGINE=wayland_egl
-#export ECORE_EVAS_ENGINE=wayland_egl
-export ELM_ENGINE=wayland_shm
-export ECORE_EVAS_ENGINE=wayland_shm
-export XDG_RUNTIME_DIR=/run/user/5000
-
-# 4 Set Environment for Test
-export WESTON_IVI_PLUGIN_DIR="../src/.libs"
-
-# 5 Start Weston
-export XDG_CONFIG_HOME="../tests"
-MOD_DIR="$PWD/../src/.libs"
-/usr/bin/weston --backend=fbdev-backend.so --modules=$MOD_DIR/ico_plugin_loader.so --idle-time=0 --log=../tests/testlog/weston.log &
-sleep 1
-
-# 6 Set library path
-export LD_LIBRARY_PATH=../src/.libs:$LD_LIBRARY_PATH
-
-# 7 Start test-homescreen
-../tests/test-homescreen < ../tests/testdata/hs_alltest.dat 2> ../tests/testlog/test-homescreen.log 1>&2
-
-# 8 End of Test
-sleep 2
-/usr/bin/killall weston
-/usr/bin/killall test-send_event
-sleep 1
-
-# 9 Check Error
-FOUND_ERR=0
-/bin/grep "ERR>" testlog/*
-if [ "$?" != "1" ] ; then
-       FOUND_ERR=1
-fi
-/bin/grep "WRN>" testlog/*
-if [ "$?" != "1" ] ; then
-       FOUND_ERR=1
-fi
-/bin/grep "Error" testlog/*
-if [ "$?" != "1" ] ; then
-       FOUND_ERR=1
-fi
-/bin/grep "error" testlog/* | /bin/grep -v "error_but_no_problem_for_test"
-if [ "$?" != "1" ] ; then
-       FOUND_ERR=1
-fi
-/bin/grep "Fail" testlog/* | /bin/grep -v "error_but_no_problem_for_test" | /bin/grep -v "initialize backlight"
-if [ "$?" != "1" ] ; then
-       FOUND_ERR=1
-fi
-
-if [ $FOUND_ERR = 0 ] ; then
-       echo "Weston IVI Plugin Test: OK"
-else
-       echo "Weston IVI Plugin Test: ERROR"
-fi
-

diff --git a/tests/weston-plugin-test.vmap b/tests/weston-plugin-test.vmap
deleted file mode 100755 (executable)
index 1384efd..0000000
--- a/tests/weston-plugin-test.vmap
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-#
-#      Weston IVI Plugin Test
-#
-#        Remark: This examination premises that Weston does not run.
-
-# 1 Delete log file
-mkdir ../tests/testlog 2> /dev/null
-rm -fr ../tests/testlog/* 2> /dev/null
-
-# 2 Start Pseudo event device (for Touch Panel)
-../tests/test-send_event -d -mq=5551 2> ../tests/testlog/event_log.log &
-sleep 1
-
-# 3 Weston/Wayland Envionment
-export QT_QPA_PLATFORM=wayland
-export ELM_ENGINE=wayland_shm
-export ECORE_EVAS_ENGINE=wayland_shm
-
-# 4 Set Environment for Test
-export WESTON_IVI_PLUGIN_DIR="../src/.libs"
-
-# 5 Start Weston
-export XDG_CONFIG_HOME="../tests"
-MOD_DIR="$PWD/../src/.libs"
-/usr/bin/weston --backend=fbdev-backend.so --modules=$MOD_DIR/ico_plugin_loader.so --idle-time=0 --log=../tests/testlog/weston.log &
-sleep 1
-
-# 6 Set library path
-export LD_LIBRARY_PATH=../src/.libs:$LD_LIBRARY_PATH
-
-# 7 Start test-homescreen
-../tests/test-homescreen < ../tests/testdata/hs_mapsurf.dat 2> ../tests/testlog/test-homescreen.log
-
-# 8 End of Test
-sleep 2
-/usr/bin/killall weston
-/usr/bin/killall test-send_event
-sleep 1
-
-# 9 Check Error
-FOUND_ERR=0
-/bin/grep "ERR>" testlog/*
-if [ "$?" != "1" ] ; then
-       FOUND_ERR=1
-fi
-/bin/grep "WRN>" testlog/*
-if [ "$?" != "1" ] ; then
-       FOUND_ERR=1
-fi
-/bin/grep "Error" testlog/*
-if [ "$?" != "1" ] ; then
-       FOUND_ERR=1
-fi
-/bin/grep "error" testlog/* | /bin/grep -v "error_but_no_problem_for_test"
-if [ "$?" != "1" ] ; then
-       FOUND_ERR=1
-fi
-/bin/grep "Fail" testlog/* | /bin/grep -v "error_but_no_problem_for_test" | /bin/grep -v "initialize backlight"
-if [ "$?" != "1" ] ; then
-       FOUND_ERR=1
-fi
-
-if [ $FOUND_ERR = 0 ] ; then
-       echo "Weston IVI Plugin Test: OK"
-else
-       echo "Weston IVI Plugin Test: ERROR"
-fi
-