diff options
| author | runge <runge@karlrunge.com> | 2009-12-28 11:21:50 -0500 |
|---|---|---|
| committer | runge <runge@karlrunge.com> | 2009-12-28 11:21:50 -0500 |
| commit | 5764cd3fdd669096a84c7e40a2893cd45df090e4 (patch) | |
| tree | e82be24266b1691941182f0bedecf41cac83cfb4 /x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc_cmd | |
| parent | 018f152bc5c99503d1f59b073046b2f5dca9b042 (diff) | |
| download | libtdevnc-5764cd3fdd669096a84c7e40a2893cd45df090e4.tar.gz libtdevnc-5764cd3fdd669096a84c7e40a2893cd45df090e4.zip | |
x11vnc: Fix problems in --without-x builds. Fix crash
with -QD query for dbus info. Adjust window size for
small screens in -gui. Improve F1 help for xdm, etc.
include ssvnc 1.0.25 source.
Diffstat (limited to 'x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc_cmd')
| -rwxr-xr-x | x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc_cmd | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc_cmd b/x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc_cmd index 7b5e62b..f84eb58 100755 --- a/x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc_cmd +++ b/x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc_cmd @@ -25,13 +25,16 @@ # # ssvnc_cmd [ss_vncviewer-args] hostname:N [vncviewer-args] # -# if, instead, this script is named "tightvncviewer" it calls the -# vncviewer directly and must be invoked as: +# if, instead, this script is named "tightvncviewer" or "-viewer" is the +# first argument it calls the vncviewer directly (there is no encryption) +# and must be invoked as: # # tightvncviewer [vncviewer-args] hostname:N +# or +# ssvnc_cmd -viewer [vncviewer-args] hostname:N # # In both cases, "hostname:N" is the host and VNC display to connect to, -# e.g. snoopy:0 +# e.g. snoopy:0. (-listen N and -appshare N modes works too.) # # See the script util/ss_vncviewer for details about its arguments: # @@ -240,6 +243,15 @@ if [ "X$1" = "X-ssl" ]; then base="ssvnc_cmd" fi +do_viewer_directly="" +if [ "X$1" = "X-viewer" ]; then + do_viewer_directly=1 + shift +fi +if [ "X$base" = "Xtightvncviewer" ]; then + do_viewer_directly=1 +fi + # If ours (and not cotvnc), force the use of tight encoding for localhost # redir connection: # @@ -260,13 +272,13 @@ if [ $use_ours = 1 ]; then fi fi - if [ "X$base" = "Xtightvncviewer" ]; then + if [ "X$do_viewer_directly" = "X1" ]; then $VNCVIEWERCMD -encodings 'copyrect tight zrle zlib hextile' "$@" else ss_vncviewer "$@" -encodings 'copyrect tight zrle zlib hextile' fi else - if [ "X$base" = "Xtightvncviewer" ]; then + if [ "X$do_viewer_directly" = "X1" ]; then $VNCVIEWERCMD "$@" else ss_vncviewer "$@" |