diff options
| author | runge <runge> | 2004-12-20 15:46:51 +0000 |
|---|---|---|
| committer | runge <runge> | 2004-12-20 15:46:51 +0000 |
| commit | 88c3bc66450281c6d1599e5b2cfd9ec334cdfb83 (patch) | |
| tree | 2379635661c6bffec76d45aa19d1c4df7acdeda8 /x11vnc/tkx11vnc.h | |
| parent | 2cc1b1d3e7c429e5e9b719ee619a3f52de005ac4 (diff) | |
| download | libtdevnc-88c3bc66450281c6d1599e5b2cfd9ec334cdfb83.tar.gz libtdevnc-88c3bc66450281c6d1599e5b2cfd9ec334cdfb83.zip | |
x11vnc: minor tweaks for 0.7 file release
Diffstat (limited to 'x11vnc/tkx11vnc.h')
| -rw-r--r-- | x11vnc/tkx11vnc.h | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/x11vnc/tkx11vnc.h b/x11vnc/tkx11vnc.h index 63db7dd..0f442a2 100644 --- a/x11vnc/tkx11vnc.h +++ b/x11vnc/tkx11vnc.h @@ -174,6 +174,7 @@ " =F logfile:\n" " quiet\n" " --\n" +" =GA show-start-cmd\n" " =G debug_gui\n" "\n" "Permissions\n" @@ -240,6 +241,14 @@ "output, kill it, etc.\n" "\"\n" "\n" +" set helptext(show-start-cmd) \"\n" +"Displays in the text area what the x11vnc start command (i.e. the command\n" +"run by \\\"Actions -> start\\\") looks like for the current values of the\n" +"settings. This can be done even in the attached state. Intended for\n" +"debugging the gui. The help item for \\\"Actions -> start\\\" gives the\n" +"same info.\n" +"\"\n" +"\n" " set helptext(debug_gui) \"\n" "Set debug_gui to get more output printed in the text area.\n" "\"\n" @@ -547,6 +556,9 @@ " set str [get_start_x11vnc_txt]\n" " append text $str\n" " append_text \"$str\\n\"\n" +" append text \"\\nPossible \\$HOME/.x11vncrc settings for this command:\\n\\n\"\n" +" set rctxt [get_start_x11vnc_cmd 1]\n" +" append text \"$rctxt\\n\"\n" " }\n" "\n" " regsub -all { } $item \" \" name\n" @@ -1397,6 +1409,9 @@ " } elseif {$item == \"clear-all\"} {\n" " clear_all\n" " return\n" +" } elseif {$item == \"show-start-cmd\"} {\n" +" show_start_cmd\n" +" return\n" " } elseif {$item == \"all-settings\"} {\n" " show_all_settings\n" " return\n" @@ -2086,7 +2101,12 @@ " return $msg\n" "}\n" "\n" -"proc get_start_x11vnc_cmd {} {\n" +"proc show_start_cmd {} {\n" +" set msg [get_start_x11vnc_txt]\n" +" append_text \"$msg\\n\"\n" +"}\n" +"\n" +"proc get_start_x11vnc_cmd {{show_rc 0}} {\n" " global menu_var unset_str x11vnc_prog\n" "\n" " set xterm_cmd \"xterm -iconic -geometry 80x35 -title x11vnc-console -e\"\n" @@ -2095,6 +2115,8 @@ "\n" " lappend cmd $x11vnc_prog\n" "\n" +" set rc_txt \"\"\n" +"\n" " set saw_id 0\n" "\n" " foreach item [lsort [array names menu_var]] {\n" @@ -2125,11 +2147,15 @@ " if {$item == \"dontdisconnect\" && $menu_var($item) == \"-1\"} {\n" " continue\n" " }\n" +" if {$item == \"alwaysshared\" && $menu_var($item) == \"-1\"} {\n" +" continue\n" +" }\n" "\n" " if {[value_is_bool $item]} {\n" " if {[info exists menu_var($item)]} {\n" " if {$menu_var($item)} {\n" " lappend cmd \"-$item\"\n" +" append rc_txt \"-$item\\n\"\n" " }\n" " }\n" " } elseif {[value_is_string $item]} {\n" @@ -2139,9 +2165,12 @@ " set nitem $item\n" " if {$nitem == \"screen_blank\"} {\n" " set nitem \"sb\"\n" +" } elseif {$nitem == \"xrandr_mode\"} {\n" +" set nitem \"xrandr\"\n" " }\n" " lappend cmd \"-$nitem\"\n" " lappend cmd $menu_var($item)\n" +" append rc_txt \"-$nitem $menu_var($item)\\n\"\n" " }\n" " }\n" " }\n" @@ -2150,7 +2179,11 @@ " lappend cmd \"/dev/null\"\n" " lappend cmd \"&\"\n" " \n" -" return $cmd\n" +" if {$show_rc} {\n" +" return $rc_txt\n" +" } else {\n" +" return $cmd\n" +" }\n" "}\n" "\n" "proc start_x11vnc {} {\n" |