Skip to content

Commit

Permalink
misc/etv sync.
Browse files Browse the repository at this point in the history
  • Loading branch information
runge committed May 5, 2010
1 parent a8ae062 commit 21fd3a4
Show file tree
Hide file tree
Showing 15 changed files with 923 additions and 345 deletions.
2 changes: 1 addition & 1 deletion classes/ssl/index.vnc
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ $USER's $DESKTOP desktop ($DISPLAY)
$PARAMS
</APPLET>
<BR>
<A href="http://www.tightvnc.com/">TightVNC site</A>
<A href="http://www.karlrunge.com/x11vnc">x11vnc site</A>
</HTML>
2 changes: 1 addition & 1 deletion classes/ssl/proxy.vnc
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,5 @@ $USER's $DESKTOP desktop ($DISPLAY)
$PARAMS
</APPLET>
<BR>
<A href="http://www.tightvnc.com/">TightVNC site</A>
<A href="http://www.karlrunge.com/x11vnc">x11vnc site</A>
</HTML>
2 changes: 1 addition & 1 deletion classes/ssl/ultra.vnc
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ $USER's $DESKTOP desktop ($DISPLAY)
$PARAMS
</APPLET>
<BR>
<A href="http://www.ultravnc.com/">UltraVNC site</A>
<A href="http://www.karlrunge.com/x11vnc">x11vnc site</A>
</HTML>
2 changes: 1 addition & 1 deletion classes/ssl/ultraproxy.vnc
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ $USER's $DESKTOP desktop ($DISPLAY)
$PARAMS
</APPLET>
<BR>
<A href="http://www.ultravnc.com/">UltraVNC site</A>
<A href="http://www.karlrunge.com/x11vnc">x11vnc site</A>
</HTML>
2 changes: 1 addition & 1 deletion classes/ssl/ultrasigned.vnc
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ $USER's $DESKTOP desktop ($DISPLAY)
$PARAMS
</APPLET>
<BR>
<A href="http://www.ultravnc.com/">UltraVNC site</A>
<A href="http://www.karlrunge.com/x11vnc">x11vnc site</A>
</HTML>
2 changes: 1 addition & 1 deletion prepare_x11vnc_dist.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

VERSION="0.9.10"
VERSION="0.9.11"

cd "$(dirname "$0")"

Expand Down
62 changes: 41 additions & 21 deletions x11vnc/README
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Copyright (C) 2002-2010 Karl J. Runge <[email protected]>
All rights reserved.

x11vnc README file Date: Fri Apr 30 00:43:58 EDT 2010
x11vnc README file Date: Sun May 2 18:25:14 EDT 2010

The following information is taken from these URLs:

Expand Down Expand Up @@ -586,12 +586,12 @@ vncviewer -via $host localhost:0 # must be TightVNC vncviewer.
SourceForge.net. I use libvncserver for all of the VNC aspects; I
couldn't have done without it. The full source code may be found and
downloaded (either file-release tarball or GIT tree) from the above
link. As of Dec 2009, the x11vnc-0.9.9.tar.gz source package is
released (recommended download). The x11vnc 0.9.9 release notes.
link. As of May 2010, the x11vnc-0.9.10.tar.gz source package is
released (recommended download). The x11vnc 0.9.10 release notes.

The x11vnc package is the subset of the libvncserver package needed to
build the x11vnc program. Also, you can get a copy of my latest,
bleeding edge x11vnc-0.9.10-dev.tar.gz tarball to build the most up to
bleeding edge x11vnc-0.9.11-dev.tar.gz tarball to build the most up to
date one.

Precompiled Binaries/Packages: See the FAQ below for information
Expand Down Expand Up @@ -629,13 +629,13 @@ vncviewer -via $host localhost:0 # must be TightVNC vncviewer.
default.) See this build FAQ for more details.

If your OS has libjpeg.so and libz.so in standard locations you can
build as follows (example given for the 0.9.9 release of x11vnc:
build as follows (example given for the 0.9.10 release of x11vnc:
replace with the version you downloaded):
(un-tar the x11vnc+libvncserver tarball)
# gzip -dc x11vnc-0.9.9.tar.gz | tar -xvf -
# gzip -dc x11vnc-0.9.10.tar.gz | tar -xvf -

(cd to the source directory)
# cd x11vnc-0.9.9
# cd x11vnc-0.9.10

(run configure and then run make)
# ./configure
Expand Down Expand Up @@ -885,13 +885,13 @@ make
I'd appreciate any additional testing very much.

Thanks to those who suggested features and helped beta test x11vnc
0.9.9 released in Dec 2009!
0.9.10 released in May 2010!

Please help test and debug the 0.9.10 version for release sometime in
Spring 2010.
Please help test and debug the 0.9.11 version for release sometime in
Summer 2010.

The version 0.9.10 beta tarball is kept here:
x11vnc-0.9.10-dev.tar.gz
The version 0.9.11 beta tarball is kept here:
x11vnc-0.9.11-dev.tar.gz

There are also some Linux, Solaris, Mac OS X, and other OS test
binaries here. Please kick the tires and report bugs, performance
Expand All @@ -908,6 +908,10 @@ make
settings panel.)


Here are some features that will appear in the 0.9.11 release:
* Coming Soon.


Here are some features that will appear in the 0.9.10 release:
* The included SSL enabled Java applet viewer now supports Chained
SSL Certificates. The debugCerts=yes applet parameter aids
Expand Down Expand Up @@ -11495,13 +11499,13 @@ or: PORT= vncserver :4; sleep 15
From the -help output:
SSVNC Viewer (based on TightVNC viewer version 1.3.9)

Usage: ./vncviewer [<OPTIONS>] [<HOST>][:<DISPLAY#>]
./vncviewer [<OPTIONS>] [<HOST>][::<PORT#>]
./vncviewer [<OPTIONS>] exec=[CMD ARGS...]
./vncviewer [<OPTIONS>] fd=n
./vncviewer [<OPTIONS>] /path/to/unix/socket
./vncviewer [<OPTIONS>] -listen [<DISPLAY#>]
./vncviewer -help
Usage: vncviewer [<OPTIONS>] [<HOST>][:<DISPLAY#>]
vncviewer [<OPTIONS>] [<HOST>][::<PORT#>]
vncviewer [<OPTIONS>] exec=[CMD ARGS...]
vncviewer [<OPTIONS>] fd=n
vncviewer [<OPTIONS>] /path/to/unix/socket
vncviewer [<OPTIONS>] -listen [<DISPLAY#>]
vncviewer -help

<OPTIONS> are standard Xt options, or:
-via <GATEWAY>
Expand Down Expand Up @@ -11781,6 +11785,10 @@ r
specify as many as you need on the command line. For
example, -env SSVNC_MULTIPLE_LISTEN=MAX:5 -env EDITOR=vi

-noipv6 Disable all IPv6 sockets. Same as VNCVIEWER_NO_IPV6=1.

-noipv4 Disable all IPv4 sockets. Same as VNCVIEWER_NO_IPV4=1.

-printres Print out the Ssvnc X resources (appdefaults) and then exit
You can save them to a file and customize them (e.g. the
keybindings and Popup menu) Then point to the file via
Expand All @@ -11792,6 +11800,18 @@ r
.
This is currently the default, use -nopipeline to disable.

-appshare Enable features for use with x11vnc's -appshare mode where
instead of sharing the full desktop only the application's
windows are shared. Viewer multilisten mode is used to
create the multiple windows: -multilisten is implied.
See 'x11vnc -appshare -help' more information on the mode.

Features enabled in the viewer under -appshare are:
Minimum extra text in the title, auto -ycrop is disabled,
x11vnc -remote_prefix X11VNC_APPSHARE_CMD: message channel,
x11vnc initial window position hints. See also Escape Keys
below for additional key and mouse bindings.

-escape str This sets the 'Escape Keys' modifier sequence and enables
escape keys mode. When the modifier keys escape sequence
is held down, the next keystroke is interpreted locally
Expand Down Expand Up @@ -12079,7 +12099,7 @@ x11vnc: a VNC server for real X displays
Here are all of x11vnc command line options:
% x11vnc -opts (see below for -help long descriptions)

x11vnc: allow VNC connections to real X11 displays. 0.9.10 lastmod: 2010-04-28
x11vnc: allow VNC connections to real X11 displays. 0.9.11 lastmod: 2010-05-02

x11vnc options:
-display disp -auth file -N
Expand Down Expand Up @@ -12209,7 +12229,7 @@ libvncserver-tight-extension options:

% x11vnc -help

x11vnc: allow VNC connections to real X11 displays. 0.9.10 lastmod: 2010-04-28
x11vnc: allow VNC connections to real X11 displays. 0.9.11 lastmod: 2010-05-02

(type "x11vnc -opts" to just list the options.)

Expand Down
12 changes: 6 additions & 6 deletions x11vnc/misc/enhanced_tightvnc_viewer/README
Original file line number Diff line number Diff line change
Expand Up @@ -255,15 +255,15 @@ Unix and Mac OS X:

Unpack the archive:

% gzip -dc ssvnc-1.0.27.tar.gz | tar xvf -
% gzip -dc ssvnc-1.0.28.tar.gz | tar xvf -

Run the GUI:

% ./ssvnc/Unix/ssvnc (for Unix)

% ./ssvnc/MacOSX/ssvnc (for Mac OS X)

The smaller file "ssvnc_no_windows-1.0.27.tar.gz"
The smaller file "ssvnc_no_windows-1.0.28.tar.gz"
could have been used as well.

On MacOSX you could also click on the SSVNC app icon in the Finder.
Expand Down Expand Up @@ -309,8 +309,8 @@ Unix/MacOSX Install:

For the conventional source tarball it will compile and install, e.g.:

gzip -dc ssvnc-1.0.27.src.tar.gz | tar xvf -
cd ssvnc-1.0.27
gzip -dc ssvnc-1.0.28.src.tar.gz | tar xvf -
cd ssvnc-1.0.28
make config
make all
make PREFIX=/my/install/dir install
Expand All @@ -322,7 +322,7 @@ Windows:

Unzip, using WinZip or a similar utility, the zip file:

ssvnc-1.0.27.zip
ssvnc-1.0.28.zip

Run the GUI, e.g.:

Expand All @@ -334,7 +334,7 @@ Windows:

select Open, and then OK to launch it.

The smaller file "ssvnc_windows_only-1.0.27.zip"
The smaller file "ssvnc_windows_only-1.0.28.zip"
could have been used as well.

You can make a Windows shortcut to this program if you want to.
Expand Down
32 changes: 31 additions & 1 deletion x11vnc/misc/enhanced_tightvnc_viewer/Windows/util/connect_br.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -1086,11 +1086,25 @@ proc proxy_hostport {proxy} {

proc setb {} {
wm withdraw .
catch {destroy .b}
button .b -text "CONNECT_BR" -command {destroy .}
pack .b
after 1000 check_callback
}

proc connect_br_sleep {} {
global env
if [info exists env(CONNECT_BR_SLEEP)] {
if [regexp {^[0-9][0-9]*$} $env(CONNECT_BR_SLEEP)] {
setb
for {set i 0} {$i < $env(CONNECT_BR_SLEEP)} {incr i} {
bmesg "$i sleep"
after 1000
}
}
}
}

global env

set got_connection 0
Expand Down Expand Up @@ -1220,16 +1234,32 @@ if {$do_bridge} {
destroy .
exit 1
}
setb
set rc [catch {set lsock [socket $rhost $rport]}]
if {$rc != 0} {
puts stderr "error reversing"
bmesg "1 error reversing"
after 2000
set rc [catch {set lsock [socket $rhost $rport]}]
}
if {$rc != 0} {
puts stderr "error reversing"
bmesg "2 error reversing"
after 2000
set rc [catch {set lsock [socket $rhost $rport]}]
}
if {$rc != 0} {
puts stderr "error reversing"
bmesg "3 error reversing"
destroy .; exit 1
}
puts stderr "SSVNC_REVERSE to $rhost $rport OK";
setb
bmesg "SSVNC_REVERSE to $rhost $rport OK";
connect_br_sleep
handle_connection $lsock $rhost $rport
} else {
set lport $env(SSVNC_LISTEN)
connect_br_sleep
set rc [catch {set lsock [socket -myaddr 127.0.0.1 -server handle_connection $lport]}]
if {$rc != 0} {
puts stderr "error listening"
Expand Down
Loading

0 comments on commit 21fd3a4

Please sign in to comment.