diff options
Diffstat (limited to 'x11vnc/tkx11vnc.h')
| -rw-r--r-- | x11vnc/tkx11vnc.h | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/x11vnc/tkx11vnc.h b/x11vnc/tkx11vnc.h index 512a45f..c3642e6 100644 --- a/x11vnc/tkx11vnc.h +++ b/x11vnc/tkx11vnc.h @@ -118,17 +118,17 @@ " overlay\n" " overlay_nocursor\n" " --\n" +" =D solid\n" +" solid_color:\n" " visual:\n" " flashcmap\n" " shiftcmap:\n" " notruecolor\n" " --\n" -" clip:\n" " =P blackout:\n" " xinerama\n" -" --\n" -" =D solid\n" -" solid_color:\n" +" clip:\n" +" rawfb:\n" " --\n" " = xrandr\n" " =-C:resize,newfbsize,exit xrandr_mode:\n" @@ -176,6 +176,8 @@ " noprimary\n" " nolookup\n" " --\n" +" xtrap\n" +" --\n" " bg\n" " =-C:ignore,exit sigpipe:\n" " =0 inetd\n" @@ -2889,7 +2891,7 @@ "\n" "proc run_remote_cmd {opts} {\n" " global menu_var x11vnc_prog x11vnc_cmdline x11vnc_xdisplay\n" -" global x11vnc_auth_file\n" +" global x11vnc_auth_file x11vnc_connect_file\n" "\n" " set debug [in_debug_mode]\n" "\n" @@ -2908,13 +2910,18 @@ "\n" " lappend cmd $x11vnc_prog;\n" "\n" -" if {$x11vnc_xdisplay != \"\"} {\n" -" lappend cmd \"-display\"\n" -" lappend cmd $x11vnc_xdisplay\n" -" }\n" -" if {$x11vnc_auth_file != \"\"} {\n" -" lappend cmd \"-auth\"\n" -" lappend cmd $x11vnc_auth_file\n" +" if {$x11vnc_connect_file != \"\"} {\n" +" lappend cmd \"-connect\"\n" +" lappend cmd $x11vnc_connect_file\n" +" } else {\n" +" if {$x11vnc_xdisplay != \"\"} {\n" +" lappend cmd \"-display\"\n" +" lappend cmd $x11vnc_xdisplay\n" +" }\n" +" if {$x11vnc_auth_file != \"\"} {\n" +" lappend cmd \"-auth\"\n" +" lappend cmd $x11vnc_auth_file\n" +" }\n" " }\n" " lappend cmd \"-sync\"\n" " foreach word $opts {\n" @@ -3004,7 +3011,7 @@ "# main:\n" "\n" "global env x11vnc_prog x11vnc_cmdline x11vnc_xdisplay x11vnc_connect;\n" -"global x11vnc_auth_file beginner_mode simple_gui_created\n" +"global x11vnc_auth_file x11vnc_connect_file beginner_mode simple_gui_created\n" "global helpall helptext helpremote helplabel hostname;\n" "global all_settings reply_xdisplay always_update\n" "global max_text_height max_text_width\n" @@ -3075,6 +3082,12 @@ " set x11vnc_connect 0;\n" "}\n" "\n" +"if {[info exists env(X11VNC_CONNECT_FILE)]} {\n" +" set x11vnc_connect_file $env(X11VNC_CONNECT_FILE);\n" +"} else {\n" +" set x11vnc_connect_file \"\";\n" +"}\n" +"\n" "if {[info exists env(X11VNC_XDISPLAY)]} {\n" " set x11vnc_xdisplay $env(X11VNC_XDISPLAY);\n" " set x11vnc_connect 1\n" |