--- trunk/webthumb	2008/02/06 19:48:56	60
+++ trunk/webthumb	2008/02/06 21:26:10	61
@@ -33,6 +33,13 @@
 # and then resize it to (comment out to disable)
 #RESIZE=200x
 
+# turn locally visible Xnest server to watch progress
+DEBUG=0
+test ! -z "$3" && DEBUG=1
+
+# wait for $WAIT seconds for page to load
+WAIT=30
+
 # some configurable paths
 BROWSER=mozilla-firefox
 XSERVER=Xvfb
@@ -44,6 +51,8 @@
 PROFILE_DIR=`mktemp -d`
 PORT=8888
 
+LOCAL_DISPLAY=$DISPLAY
+
 if [ -z "$URL" ] ; then
 	echo "usage: $0 http://url.to.capture [screenshot.jpg]"
 	exit 1
@@ -59,6 +68,12 @@
 	exit 1
 fi
 
+while netstat -ln | grep ":$PORT " >/dev/null ; do
+	PORT=`expr $PORT + 1`
+done
+
+echo "### using port $PORT"
+
 echo -n "testing URL $URL "
 if HEAD $URL >/dev/null ; then
 	echo "ok"
@@ -71,20 +86,25 @@
 
 export DISPLAY=:42
 
-$XSERVER -ac -screen 0 ${W}x${H}x24 $DISPLAY &
-# debug server
-#Xnest -display :0 -ac -geometry ${W}x${H} -depth 24 $DISPLAY &
+
+if [ "$DEBUG" == 1 ] ; then
+	echo "Using locally visible debug server on $LOCAL_DISPLAY"
+	Xnest -display $LOCAL_DISPLAY -ac -geometry ${W}x${H} -depth 24 $DISPLAY 2>/dev/null &
+else
+	$XSERVER -ac -screen 0 ${W}x${H}x24 $DISPLAY 2>/dev/null &
+fi
 
 XSERVER_PID=$!
-echo "using pid $xserver_pid for X server"
+echo "using pid $XSERVER_PID for X server"
 
 function kill_x_server() {
-	kill $BROWSER_PID
+	echo "Killing server $XSERVER_PID"
 	kill $XSERVER_PID
 	rm -f $FRAMESET
 	rm -fr $PROFILE_DIR
+	exit 1
 }
-trap 'echo "QUIT!" >&2; kill_x_server; exit 1' INT QUIT TERM SEGV
+trap 'kill_x_server' INT QUIT TERM SEGV EXIT
 
 # create frameset to load site and after site is loaded trigger this script
 cat > $FRAMESET <<END_OF_FRAMESET
@@ -103,18 +123,29 @@
 echo "preview available with: xwd -display $DISPLAY -root | xwud"
 
 echo "making 'Screenshot' profile in $PROFILE_DIR"
-$BROWSER -CreateProfile "Screenshot $PROFILE_DIR" | grep Success
+$BROWSER -CreateProfile "Screenshot $PROFILE_DIR" 2>/dev/null | grep Success
 
 echo "launching browser $BROWSER with $URL"
-$BROWSER -P Screenshot -width $W -height $H $FRAMESET &
+$BROWSER -P Screenshot -width $W -height $H $FRAMESET 2>/dev/null &
 BROWSER_PID=$!
 
-echo "staring web server (wait for page to load)"
+function kill_browser() {
+	echo "Killing browser $BROWSER_PID"
+	kill $BROWSER_PID
+	echo "Killing server $XSERVER_PID"
+	kill $XSERVER_PID
+	rm -f $FRAMESET
+	rm -fr $PROFILE_DIR
+	exit 1
+}
+trap 'kill_browser' INT QUIT TERM SEGV EXIT
+
+echo "waiting for on_load event from browser $BROWSER_PID for ${WAIT}s"
 
 # there is hard-coded limit here:
-# we will wait 60sec for page to load and render
+# we will wait $WAIT sec for page to load and render
 
-echo -e "HTTP/1.0 304 Not modified\r\n\r\n" | nc -l -w 60 -p $PORT >/dev/null
+echo -e "HTTP/1.0 304 Not modified\r\n\r\n" | nc -l -w $WAIT -p $PORT >/dev/null || echo "Timeout after $WAIT sec!"
 
 # get Mozilla Firefox window id (for resize)
 WINDOW_ID=`xwininfo -display $DISPLAY -root -tree | grep gecko | cut -d\" -f1 | sort -n | head -1`
@@ -155,5 +186,3 @@
 
 import -window $DUMP_ID $RESIZE $FILE
 
-kill_x_server
-