diff options
| author | runge <runge> | 2008-12-10 17:12:27 +0000 |
|---|---|---|
| committer | runge <runge> | 2008-12-10 17:12:27 +0000 |
| commit | 8bef644d17f62ea6daf7459b863f05de187966fe (patch) | |
| tree | 5137fbbab354ccfe29622a99c3d913c558d1c87a /x11vnc/tkx11vnc.h | |
| parent | e68192915936e173b887856a019d4a54ba96069c (diff) | |
| download | libtdevnc-8bef644d17f62ea6daf7459b863f05de187966fe.tar.gz libtdevnc-8bef644d17f62ea6daf7459b863f05de187966fe.zip | |
x11vnc: 0.9.6 release. Some strtok bugfixes. rename -tlsvnc
to -anontls. Disable ssl caching. No cert creation prompting
in inetd or bg modes. waitpid a bit more carefully on ssl
helpers. Tune ssl initial timeouts. Let -create user specify
starting X display. fix -rfbport prompt gui for older tk.
-sslonly option. Error if no -ssl with related options. -rand
option. -ssl implies -ssl SAVE
Diffstat (limited to 'x11vnc/tkx11vnc.h')
| -rw-r--r-- | x11vnc/tkx11vnc.h | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/x11vnc/tkx11vnc.h b/x11vnc/tkx11vnc.h index b40c21d..6787be0 100644 --- a/x11vnc/tkx11vnc.h +++ b/x11vnc/tkx11vnc.h @@ -425,6 +425,7 @@ char gui_code[] = ""; " grow:\n" " fuzz:\n" " wait_ui:\n" +" setdefer:\n" " nowait_bog\n" " slow_fb:\n" " xrefresh:\n" @@ -6471,8 +6472,11 @@ char gui_code[] = ""; " vncviewer $hn:0\n" " vncviewer $hn:1\n" " etc.\n" +"\n" +" Your firewall may block incoming connections to TCP ports;\n" +" if it does you may need to reconfigure it. \n" " \n" -" You may also set some additional parameters:\n" +" You can also set some additional parameters:\n" "\n" " - Enable SSL encryption.\n" " (requires an SSL enabled vncviewer, such as SSVNC) \n" @@ -6488,9 +6492,24 @@ char gui_code[] = ""; " wm protocol . WM_DELETE_WINDOW \"destroy .; exit\"\n" " wm protocol .pp WM_DELETE_WINDOW \"destroy .pp; exit\"\n" "\n" -" label .pp.m -text \"$text\" -justify left -font $ffont\n" +" label .pp.m -text \"$text\" -relief ridge -justify left -font $ffont\n" +"\n" +" global tk_version\n" +" set tkold 0\n" +" if [info exists tk_version] {\n" +" if [regexp {^8\\.[0-3]$} $tk_version] {\n" +" set tkold 1\n" +" }\n" +" if [regexp {^[3-7]\\.} $tk_version] {\n" +" set tkold 1\n" +" }\n" +" }\n" "\n" -" frame .pp.f -bd 1 -relief ridge -pady 2\n" +" if {$tkold} {\n" +" frame .pp.f -bd 1 -relief ridge\n" +" } else {\n" +" frame .pp.f -bd 1 -relief ridge -pady 2\n" +" }\n" " label .pp.f.l -text \"Port: \"\n" " entry .pp.f.e -width 8 -textvariable port_set\n" " global enable_ssl; set enable_ssl 0\n" @@ -6506,7 +6525,11 @@ char gui_code[] = ""; " pack .pp.f.l .pp.f.e -side left\n" " pack .pp.f.loc .pp.f.ssl -side right\n" "\n" -" frame .pp.t -bd 1 -relief ridge -pady 2\n" +" if {$tkold} {\n" +" frame .pp.t -bd 1 -relief ridge\n" +" } else {\n" +" frame .pp.t -bd 1 -relief ridge -pady 2\n" +" }\n" " global file_transfer; set file_transfer \"none\"\n" " if [info exists env(X11VNC_FILETRANSFER_ENABLED)] {\n" " set file_transfer $env(X11VNC_FILETRANSFER_ENABLED)\n" @@ -7088,7 +7111,7 @@ char gui_code[] = ""; " set m \"${m} 'Apply' to allow incoming connections.\\n\" \n" " set m \"${m}\\n\" \n" " set m \"${m} The passwords are only for this x11vnc\\n\" \n" -" set m \"${m} session and are not saved. Run x11vnc\\n\" \n" +" set m \"${m} session and are not saved. Run x11vnc\\n\" \n" " set m \"${m} manually for more control.\\n\" \n" " set m \"${m}\\n\" \n" " set m \"${m} See 'Help' for details on each option.\\n\" \n" |