x11vnc: more improvements to -scrollcopyrect and -xkb modes.

1 files changed, 67 insertions, 19 deletions

diff --git a/x11vnc/tkx11vnc.h b/x11vnc/tkx11vnc.h
index a92a212..bf9e26b 100644
--- a/x11vnc/tkx11vnc.h
+++ b/x11vnc/tkx11vnc.h
@@ -138,6 +138,7 @@
 "	=D norepeat\n"
 "	=D add_keysyms\n"
 "	skip_keycodes:\n"
+"	skip_dups\n"
 "	modtweak\n"
 "	xkb\n"
 "	--\n"
@@ -186,6 +187,15 @@
 "	--\n"
 "	=RA remote-cmd:\n"
 "	=GA all-settings\n"
+"	--\n"
+"	=GAL Misc-Tuning::\n"
+"	fs:\n"
+"	gaps:\n"
+"	grow:\n"
+"	fuzz:\n"
+"	readtimeout:\n"
+"	snapfb\n"
+"	threads\n"
 "\n"
 "Debugging\n"
 "	debug_pointer\n"
@@ -197,8 +207,10 @@
 "	--\n"
 "	debug_xevents\n"
 "	debug_xdamage\n"
-"	debug_wireframe\n"
+"	=-C:0,1,2,3 debug_wireframe:\n"
 "	debug_scroll\n"
+"	debug_tiles\n"
+"	dbg\n"
 "	--\n"
 "	=GA show-start-cmd\n"
 "	=DG debug_gui\n"
@@ -240,15 +252,24 @@
 "	input_skip:\n"
 "	=D nodragging\n"
 "	--\n"
+"	noshm\n"
+"	flipbyteorder\n"
+"	onetile\n"
+"	--\n"
+"	xdamage\n"
+"	xd_area:\n"
+"	xd_mem:\n"
+"	--\n"
 "	wireframe\n"
 "	wireframe_mode:\n"
 "	=-C:never,top,always wirecopyrect:\n"
+"	--\n"
 "	=-C:never,keys,mouse,always scrollcopyrect:\n"
 "	scr_area:\n"
-"	--\n"
-"	noshm\n"
-"	flipbyteorder\n"
-"	onetile\n"
+"	scr_skip:\n"
+"	scr_inc:\n"
+"	scr_keys:\n"
+"	scr_parms:\n"
 "	-- D\n"
 "	speeds:\n"
 "	=D wait:\n"
@@ -256,18 +277,6 @@
 "	=D nap\n"
 "	screen_blank:\n"
 "	--\n"
-"	fs:\n"
-"	gaps:\n"
-"	grow:\n"
-"	fuzz:\n"
-"	snapfb\n"
-"	--\n"
-"	xdamage\n"
-"	xd_area:\n"
-"	xd_mem:\n"
-"	--\n"
-"	threads\n"
-"	--\n"
 "	progressive:\n"
 "\"\n"
 "}\n"
@@ -401,6 +410,11 @@
 "\n"
 "	set helptext(all) $helpall\n"
 "\n"
+"	set helptext(Misc-Tuning:) \"\n"
+"These contain some miscellaneous tuning parameters that are not\n"
+"often used.  Placed here to avoid overcrowding in the Tuning menu.\n"
+"\"\n"
+"\n"
 "	set helptext(gui) \"\n"
 "tkx11vnc is a simple frontend to x11vnc.  Nothing fancy, it merely\n"
 "provides an interface to each of the many x11vnc command line options and\n"
@@ -707,7 +721,7 @@
 "	set text \"Help on $item:\\n\\n\"\n"
 "\n"
 "	if {[is_gui_internal $item]} {\n"
-"		if {$item != \"gui\" && $item != \"all\"} {\n"
+"		if {$item != \"gui\" && $item != \"all\" && $item != \"Misc-Tuning:\"} {\n"
 "			append text \"    + Is a gui internal Action (cannot be set).\\n\";\n"
 "		}\n"
 "	} elseif {[is_action $item]} {\n"
@@ -1163,6 +1177,9 @@
 "	if {$do_query_all} {\n"
 "		set all [all_query_vars]\n"
 "		set qargs [list \"-Q\" $all]\n"
+"\n"
+"		global last_query_all_time\n"
+"		set last_query_all_time [clock seconds]\n"
 "	}\n"
 "\n"
 "	set rqargs [concat $rargs $qargs]\n"
@@ -1652,6 +1669,7 @@
 "\n"
 "proc query_all {{quiet 0}} {\n"
 "	global query_ans_list query_aro_list all_settings\n"
+"	global last_query_all_time\n"
 "\n"
 "	set qry [all_query_vars]\n"
 "\n"
@@ -1669,6 +1687,7 @@
 "			append_text \"Failed to retrieve settings.\\n\"\n"
 "		}\n"
 "	}\n"
+"	set last_query_all_time [clock seconds]\n"
 "	return $all\n"
 "}\n"
 "\n"
@@ -1822,6 +1841,9 @@
 "	} elseif {$item == \"tail-logfile\"} {\n"
 "		tail_logfile\n"
 "		return\n"
+"	} elseif {$item == \"Misc-Tuning:\"} {\n"
+"		menu_help \"$item\"\n"
+"		return\n"
 "	} elseif {$item == \"stop+quit\"} {\n"
 "		push_new_value \"stop\" \"stop\" 1 0\n"
 "		set_connected no\n"
@@ -2487,6 +2509,29 @@
 "	}\n"
 "}\n"
 "\n"
+"proc menu_posted {} {\n"
+"	global last_query_all_time query_all_freq\n"
+"	global connected_to_x11vnc\n"
+"	set now [clock seconds]\n"
+"\n"
+"\n"
+"	if {$connected_to_x11vnc} {\n"
+"		set quiet 0\n"
+"		set refresh [expr \"$last_query_all_time + $query_all_freq\"]\n"
+"\n"
+"		# puts \"menu_posted $now $last_query_all_time\"\n"
+"		# puts \"menu_posted $refresh\"\n"
+"\n"
+"		if {$now > $refresh} {\n"
+"			append_text \"Refreshing settings... \"\n"
+"			query_all $quiet\n"
+"			if {$quiet} {\n"
+"				append_text \"done\\n\"\n"
+"			}\n"
+"		}\n"
+"	}\n"
+"}\n"
+"\n"
 "proc make_widgets {} {\n"
 "	global template \n"
 "	global menu_b menu_m menu_count\n"
@@ -2563,7 +2608,7 @@
 "				-anchor w -menu $menu -background $fbg \\\n"
 "				-font $bfont\n"
 "			pack $menub -side top -fill x\n"
-"			menu $menu -tearoff 0\n"
+"			menu $menu -tearoff 0 -postcommand menu_posted\n"
 "		}\n"
 "	}\n"
 "	pack $f -side top -fill x\n"
@@ -3038,6 +3083,7 @@
 "global connected_to_x11vnc\n"
 "global delay_sleep extra_sleep extra_sleep_split\n"
 "global cache_all_query_vars\n"
+"global last_query_all_time query_all_freq\n"
 "\n"
 "set unset_str \"(unset)\"\n"
 "set connected_to_x11vnc 0\n"
@@ -3051,6 +3097,8 @@
 "set all_settings \"None so far.\"\n"
 "set always_update 1\n"
 "set cache_all_query_vars \"\"\n"
+"set query_all_freq 120\n"
+"set last_query_all_time [clock seconds]\n"
 "\n"
 "# these are no longer used under x11vnc -sync:\n"
 "set delay_sleep 350\n"