sync with new cursor mechanism, -timeout, -noalphablend, try :0 if no other info

1 files changed, 54 insertions, 15 deletions

diff --git a/x11vnc/tkx11vnc.h b/x11vnc/tkx11vnc.h
index 2870d2e..8bca5a6 100644
--- a/x11vnc/tkx11vnc.h
+++ b/x11vnc/tkx11vnc.h
@@ -145,7 +145,7 @@
 "Pointer\n"
 "	=-C:none,arrow,X,some,most cursor:\n"
 "	noxfixes\n"
-"	alphablend\n"
+"	noalphablend\n"
 "	--\n"
 "	cursorpos\n"
 "	nocursorshape\n"
@@ -192,11 +192,12 @@
 "	localhost\n"
 "	=RA allowonce:\n"
 "	--\n"
+"	=RA noremote\n"
+"	--\n"
 "	viewonly\n"
 "	shared\n"
 "	forever\n"
-"	--\n"
-"	=RA noremote\n"
+"	timeout:\n"
 "	--\n"
 "	=SA alwaysshared\n"
 "	=SA nevershared\n"
@@ -365,35 +366,39 @@
 "and state 2), but it is worth keeping in mind it is not 100%.\n"
 "For example, you cannot set passwords or password files in state 1).\n"
 "\n"
+"\n"
 "Also note that there may be *two* separate X displays involved, not just\n"
 "one:  1) the X display x11vnc will be polling (and making available to\n"
 "VNC viewers), and 2) the X display this GUI is intended to display on.\n"
 "For example, one might use ssh to access the remote machine where the\n"
-"GUI would display on :11 and x11vnc would poll display :0.\n"
+"GUI would display on :11 and x11vnc would poll display :0.  By default\n"
+"the gui will display on the value in the DISPLAY env. variable followed\n"
+"by the value from the -display option.  To override this, use something\n"
+"like: \\\"-gui otherhost:0\\\", etc.\n"
 "\n"
 "\n"
 "GUI components: \n"
 "--- ----------\n"
 "\n"
-"At the top of the gui is a info text label where information will\n"
+"1) At the top of the gui is a info text label where information will\n"
 "be posted, e.g. when traversing menu items text indicating how to get\n"
 "help on the item and its current value will be displayed.\n"
 "\n"
-"Below the info label is the area where the menu buttons, Actions,\n"
+"2) Below the info label is the area where the menu buttons, Actions,\n"
 "Clients, etc., are presented.  If a menu item has a checkbox,\n"
 "it corresponds to a boolean on/off variable.  Otherwise it is\n"
 "either a string variable, or an action not associated with a\n"
 "variable (for the most part).\n"
 "\n"
-"Below the menu button area is a text label indicating the current x11vnc\n"
+"3) Below the menu button area is a text label indicating the current x11vnc\n"
 "X display being polled and the corresponding VNC display name.  Both\n"
 "will be \\\"(*none*)\\\" when there is no connection established.\n"
 "\n"
-"Below the x11 and vnc displays text label is a text area there scrolling\n"
+"4) Below the x11 and vnc displays text label is a text area there scrolling\n"
 "information about actions being taken and commands being run is displayed.\n"
 "To scroll use PageUp/PageDown or the arrow keys.\n"
 "\n"
-"At the bottom is an entry area.  When one selects a menu item that\n"
+"5) At the bottom is an entry area.  When one selects a menu item that\n"
 "requires supplying a string value, the label will be set to the\n"
 "parameter name and one types in the new value.  Then one presses the\n"
 "\\\"OK\\\" button or presses \\\"Enter\\\" to set the value.  Or you can press\n"
@@ -402,11 +407,13 @@
 "button selections.  Selecting these menu items will not activate the\n"
 "entry area but rather toggle the variable directly.\n"
 "\n"
-"Cascades: There is a bug not yet worked around for the cascade menus\n"
+"\n"
+"Cascades Bug: There is a bug not yet worked around for the cascade menus\n"
 "where the (?) help button gets in the way.  To get the mouse over to\n"
 "the cascade menu click and release mouse to activate the cascade, then\n"
-"you can click on its items.  Dragging with a mouse button held down\n"
-"will not work (sorry).\n"
+"you can click on its items.  Dragging with a mouse button held down will\n"
+"not work (sorry!).\n"
+"\n"
 "\n"
 "Key Bindings:\n"
 "\n"
@@ -416,6 +423,7 @@
 "	Anywhere: Control-p invokes \\\"Actions -> ping\\\"\n"
 "	Anywhere: Control-u and Control-r invoke \\\"Actions -> update-all\\\"\n"
 "\n"
+"\n"
 "Misc:\n"
 "\n"
 "Since x11vnc has so many settings and to avoid further confusion,\n"
@@ -553,7 +561,9 @@
 "	set text \"Help on $item:\\n\\n\"\n"
 "\n"
 "	if {[is_gui_internal $item]} {\n"
-"		;\n"
+"		if {$item != \"gui\" && $item != \"all\"} {\n"
+"			append text \"    + Is a gui internal Action (cannot be set).\\n\";\n"
+"		}\n"
 "	} elseif {[is_action $item]} {\n"
 "		append text \"    + Is a remote control Action (cannot be set).\\n\";\n"
 "	} elseif {[active_when_connected $item]} {\n"
@@ -601,6 +611,10 @@
 "		} else {\n"
 "			append text \"$menu_var($item)\\n\"\n"
 "		}\n"
+"		if {$item == \"http\" || $item == \"httpdir\" || $item == \"httpport\"} {\n"
+"			global vnc_url;\n"
+"			append text \"\\nURL: $vnc_url\\n\"\n"
+"		}\n"
 "	}\n"
 "\n"
 "	if {$item == \"start\"} {\n"
@@ -1227,6 +1241,8 @@
 "				set_x11_display $val\n"
 "			} elseif {$item == \"vncdisplay\"} {\n"
 "				set_vnc_display $val\n"
+"			} elseif {$item == \"http_url\"} {\n"
+"				set_vnc_url $val\n"
 "			}\n"
 "		}\n"
 "	}\n"
@@ -1359,7 +1375,7 @@
 "}\n"
 "\n"
 "proc tail_logfile {} {\n"
-"	global menu_var unset_str\n"
+"	global menu_var unset_str ffont\n"
 "	set logfile $menu_var(logfile)\n"
 "	\n"
 "	set txt \"\"\n"
@@ -1369,7 +1385,7 @@
 "		set txt \"\\nLogfile \\\"$logfile\\\" does not exist.\\n\\n\"\n"
 "	} else {\n"
 "		set cmd \"\"\n"
-"		set xterm_cmd \"xterm -geometry 80x45 -title x11vnc-logfile -e\"\n"
+"		set xterm_cmd \"xterm -sb -fn $ffont -geometry 80x45 -title x11vnc-logfile -e\"\n"
 "		set cmd [split $xterm_cmd]\n"
 "		lappend cmd \"tail\"\n"
 "		lappend cmd \"+1f\"\n"
@@ -1532,6 +1548,11 @@
 "		} else {\n"
 "			push_new_value $item $name $new 1\n"
 "		}\n"
+"\n"
+"		if {$item == \"http\"} {\n"
+"			global vnc_url\n"
+"			append_text \"  URL: $vnc_url\\n\"\n"
+"		}\n"
 "	}\n"
 "}\n"
 "\n"
@@ -1643,12 +1664,19 @@
 "	global vnc_display\n"
 "	set vnc_display \"VNC display: $name\"\n"
 "}\n"
+"proc set_vnc_url {name} {\n"
+"	global vnc_url\n"
+"	set vnc_url $name\n"
+"}\n"
 "proc no_x11_display {} {\n"
 "	set_x11_display \"(*none*)\"\n"
 "}\n"
 "proc no_vnc_display {} {\n"
 "	set_vnc_display \"(*none*)\"\n"
 "}\n"
+"proc no_vnc_url {} {\n"
+"	set_vnc_url \"(*none*)\"\n"
+"}\n"
 "\n"
 "proc fetch_displays {} {\n"
 "\n"
@@ -1657,6 +1685,7 @@
 "\n"
 "	set got_x11 0\n"
 "	set got_vnc 0\n"
+"	set got_url 0\n"
 "\n"
 "	foreach item [split_query $result] {\n"
 "		if {[regexp {^display:(.*)$} $item m0 m1]} {\n"
@@ -1665,6 +1694,9 @@
 "		} elseif {[regexp {^vncdisplay:(.*)$} $item m0 m1]} {\n"
 "			set_vnc_display $m1\n"
 "			set got_vnc 1\n"
+"		} elseif {[regexp {^http_url:(.*)$} $item m0 m1]} {\n"
+"			set_vnc_url $m1\n"
+"			set got_url 1\n"
 "		}\n"
 "	}\n"
 "	if {! $got_x11} {\n"
@@ -1673,6 +1705,9 @@
 "	if {! $got_vnc} {\n"
 "		no_vnc_display\n"
 "	}\n"
+"	if {! $got_url} {\n"
+"		no_vnc_url\n"
+"	}\n"
 "}\n"
 "\n"
 "proc disconnect_dialog {client} {\n"
@@ -2136,6 +2171,10 @@
 "				}\n"
 "			} elseif {[info exists menu_var($which)]} {\n"
 "				set label \"$label value: $menu_var($which)\"\n"
+"				if {$which == \"http\"} {\n"
+"					global vnc_url\n"
+"					set label \"$label  URL: $vnc_url\"\n"
+"				}\n"
 "			}\n"
 "		}\n"
 "		set_info $label\n"