committing old workHEADmaster

1 files changed, 9 insertions, 3 deletions

diff --git a/xvnc b/xvnc
index caebfe8..318c3a9 100755
--- a/xvnc
+++ b/xvnc
@@ -5,16 +5,22 @@
 # Restrict connections to the port opened by ssh in xvncviewer@ to the
 # corresponding ssh-x11vnc@ service.
 
+xvncviewer=xtightvncviewer
+
 remote_display=0
+if [ "$REMOTE_DISPLAY" ]
+then
+        remote_display=$REMOTE_DISPLAY
+fi
 reverse_connection()
 {
     display=${DISPLAY#:}
     display=${display%.*}
-    remote_port=$((58000 + remote_display))
+    remote_port=$((58000))
 
     local_port=$((59000 + display))
     fuser -vk $local_port/tcp
-    xvncviewer -listen $((local_port - 5500)) &
+    $xvncviewer -listen $((local_port - 5500)) &
     pid=$!
     (
         remote_display_arg=${remote_display:+ -display :$remote_display}
@@ -28,7 +34,7 @@ reverse_connection()
 direct_connection()
 {
     export VNC_VIA_CMD=": '%G'; ssh -f -L %L:%H:%R $* -- x11vnc -localhost -q -display $remote_display"
-    xvncviewer -via remote localhost
+    $xvncviewer -via remote localhost
 }
 
 if [ $# = 0 ]