From 9f5c04a634c7e2eb2198bca8d48f7059b3ae0ca3 Mon Sep 17 00:00:00 2001
From: Stefan Wildemann <gta04@metalstrolche.de>
Date: Tue, 4 Apr 2017 23:30:48 +0200
Subject: Fix xdotools use separatelog dir

---
 ci/xdotools.sh | 94 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/ci/xdotools.sh b/ci/xdotools.sh
index 67a15b83f..2d3ed14b3 100644
--- a/ci/xdotools.sh
+++ b/ci/xdotools.sh
@@ -9,8 +9,8 @@ send_event (){
     file=`printf "%05d\n" $event`
 
     import -window root $CIRCLE_ARTIFACTS/logs_${1}/frames/tmp.png
-    if [[ "$1" == "mousemove" ]]; then
-        composite -gravity NorthWest -geometry +$2+$3 ~/navit/ci/pointer-64.png $CIRCLE_ARTIFACTS/logs_${1}/frames/tmp.png $CIRCLE_ARTIFACTS/logs_${1}/frames/${file}.png
+    if [[ "$2" == "mousemove" ]]; then
+        composite -gravity NorthWest -geometry +$3+$4 ~/navit/ci/pointer-64.png $CIRCLE_ARTIFACTS/logs_${1}/frames/tmp.png $CIRCLE_ARTIFACTS/logs_${1}/frames/${file}.png
     else
         mv $CIRCLE_ARTIFACTS/logs_${1}/frames/tmp.png $CIRCLE_ARTIFACTS/logs_${1}/frames/${file}.png
     fi
@@ -21,59 +21,59 @@ send_event (){
 
 
 # Center the view
-send_event key KP_Enter # Open main menu
-send_event key Down     # Select 'Actions'
-send_event key KP_Enter # Validate
-send_event key Down     # Scroll to 'Bookmarks'
-send_event key Right    # Scroll to 'Former destinations'
-send_event key Right    # Select 'Town'
-send_event key KP_Enter # Validate
+send_event ${1} key KP_Enter # Open main menu
+send_event ${1} key Down     # Select 'Actions'
+send_event ${1} key KP_Enter # Validate
+send_event ${1} key Down     # Scroll to 'Bookmarks'
+send_event ${1} key Right    # Scroll to 'Former destinations'
+send_event ${1} key Right    # Select 'Town'
+send_event ${1} key KP_Enter # Validate
 # Send 'Berk'
-send_event key b
-send_event key e
-send_event key r
-send_event key k
-send_event key Down     # Highlight search area
-send_event key Down     # Highlight first result
-send_event key KP_Enter # Validate
+send_event ${1} key b
+send_event ${1} key e
+send_event ${1} key r
+send_event ${1} key k
+send_event ${1} key Down     # Highlight search area
+send_event ${1} key Down     # Highlight first result
+send_event ${1} key KP_Enter # Validate
 
 # Set the position
-send_event mousemove 482 318 click 1 # Open main menu, clicking on a somewhat random position on the map
-send_event key Down     # Select 'Actions'
-send_event key KP_Enter # Validate
-send_event key Down     # Scroll to 'Bookmarks'
-send_event key Right    # Scroll to 'Former destinations'
-send_event key Right    # Select current coordinates
-send_event key KP_Enter # Validate
+send_event ${1} mousemove 482 318 click 1 # Open main menu, clicking on a somewhat random position on the map
+send_event ${1} key Down     # Select 'Actions'
+send_event ${1} key KP_Enter # Validate
+send_event ${1} key Down     # Scroll to 'Bookmarks'
+send_event ${1} key Right    # Scroll to 'Former destinations'
+send_event ${1} key Right    # Select current coordinates
+send_event ${1} key KP_Enter # Validate
 
 # Set a destination
-send_event key KP_Enter # Open main menu
-send_event key Down     # Select 'Actions'
-send_event key KP_Enter # Validate
-send_event key Down     # Scroll to 'Bookmarks'
-send_event key Right    # Scroll to 'Former destinations'
-send_event key Right    # Select 'Town'
-send_event key KP_Enter # Validate
+send_event ${1} key KP_Enter # Open main menu
+send_event ${1} key Down     # Select 'Actions'
+send_event ${1} key KP_Enter # Validate
+send_event ${1} key Down     # Scroll to 'Bookmarks'
+send_event ${1} key Right    # Scroll to 'Former destinations'
+send_event ${1} key Right    # Select 'Town'
+send_event ${1} key KP_Enter # Validate
 # Send 'oakl'
-send_event key o
-send_event key a
-send_event key k
-send_event key l
-send_event key Down     # Highlight search area
-send_event key Down     # Highlight first result
-send_event key KP_Enter # Validate
+send_event ${1} key o
+send_event ${1} key a
+send_event ${1} key k
+send_event ${1} key l
+send_event ${1} key Down     # Highlight search area
+send_event ${1} key Down     # Highlight first result
+send_event ${1} key KP_Enter # Validate
 
 # Switch to 3d view
-send_event key KP_Enter # Open main menu
-send_event key Down     # Select 'Actions'
-send_event key Right    # Select 'Settings'
-send_event key KP_Enter # Validate
-send_event key Down     # Select 'Display'
-send_event key KP_Enter # Validate
-send_event key Down     # Scroll to 'Layout'
-send_event key Right    # Scroll to 'Fullscreen'
-send_event key Right    # Select '3d'
-send_event key KP_Enter # Validate
+send_event ${1} key KP_Enter # Open main menu
+send_event ${1} key Down     # Select 'Actions'
+send_event ${1} key Right    # Select 'Settings'
+send_event ${1} key KP_Enter # Validate
+send_event ${1} key Down     # Select 'Display'
+send_event ${1} key KP_Enter # Validate
+send_event ${1} key Down     # Scroll to 'Layout'
+send_event ${1} key Right    # Scroll to 'Fullscreen'
+send_event ${1} key Right    # Select '3d'
+send_event ${1} key KP_Enter # Validate
 # Send 'Berk'
 
 # capture 5 seconds of usage
-- 
cgit v1.2.1