x11vnc: -grab_buster for XGrabServer deadlock; fix scrolls and copyrect for -clip and -id

1 files changed, 35 insertions, 17 deletions

diff --git a/x11vnc/tkx11vnc.h b/x11vnc/tkx11vnc.h
index ddff298..5c84314 100644
--- a/x11vnc/tkx11vnc.h
+++ b/x11vnc/tkx11vnc.h
@@ -409,7 +409,7 @@
 "you will be presented with a dialog that shows the information\n"
 "about the VNC client.\n"
 "\n"
-"You can chose to disconnect the client by clicking on the \n"
+"You can choose to disconnect the client by clicking on the \n"
 "\\\"Disconnect\\\" checkbox and pressing \\\"OK\\\".  There will be a\n"
 "confirmation dialog to doublecheck.\n"
 "\n"
@@ -506,8 +506,8 @@
 "   remote-control commands.\n"
 "   \n"
 " - \\\"Ask for Confirmation\\\" toggles whether a popup menu will be presented\n"
-"   at the X display when a new VNC viewer attempts to connects.  The person\n"
-"   sitting at the X display can chose to accept or reject the connection\n"
+"   at the X display when a new VNC viewer attempts to connect.  The person\n"
+"   sitting at the X display can choose to accept or reject the connection\n"
 "   or accept the connection in View-Only mode.  It corresponds to the \n"
 "   \\\"-R accept:popup\\\" and \\\"-R accept:\\\" remote-control commands.\n"
 "   \n"
@@ -546,7 +546,7 @@
 "\n"
 "	set helptext(Misc-Tuning:) \"\n"
 "x11vnc has what seems like hundreds of tuning parameters.  In this\n"
-"sub-menu we place some lesser used ones.  Mostly likely you'll want to\n"
+"sub-menu we place some lesser used ones.  Most likely you'll want to\n"
 "leave them at their default values, but you can try them out quickly\n"
 "with the gui to see if they improve things.\n"
 "\"\n"
@@ -631,7 +631,7 @@
 "   mappings and so provide less variation in kinds of colors.\n"
 "\n"
 "   A visual's \\\"depth\\\" is how many of the pixels are used in the\n"
-"   actual recipe.  This may sound wasteful (i.t. not using some of the\n"
+"   actual recipe.  This may sound wasteful (i.e. not using some of the\n"
 "   bits), but for 32bpp (4 billion colors) that is too much and nearly\n"
 "   always only 24 for them are used.  The most common Visual seems to\n"
 "   be depth 24 TrueColor at 32bpp.  This provides 16 million colors\n"
@@ -651,7 +651,7 @@
 "visual does not destroy the image data in the 24bit visual.  Evidently\n"
 "popup menus can be done very quickly this way: they use the 8bit visual\n"
 "and when the popup goes away the graphics data in the 24bit visual is\n"
-"immediately reexposed without having the application redrawing it.\n"
+"immediately reexposed without having the application redraw it.\n"
 "\n"
 "Also, some legacy applications can only use 8bpp visuals.  But in these\n"
 "days of high color graphics and web browsers one would like the rest\n"
@@ -687,7 +687,7 @@
 "Note if the application pops up multiple windows they are not tracked\n"
 "and shared.  So this is not application sharing.  The application has to\n"
 "be very simple (e.g. a simple terminal or the image window on a webcam)\n"
-"for this mode to be useable.\n"
+"for this mode to be usable.\n"
 "\"\n"
 "	set helptext(ResizeRotate:) \"\n"
 "This sub-menu has some options regarding screens that support the X\n"
@@ -728,7 +728,7 @@
 "This sub-menu has some options for the x11vnc Scroll detection and\n"
 "CopyRect speedup scheme.\n"
 "\n"
-"For this mode, x11vnc \\\"spies\\\" on communication be the X server and\n"
+"For this mode, x11vnc \\\"spies\\\" on communication between the X server and\n"
 "applications using the RECORD extension.  It looks for various patterns\n"
 "to detect a scrolled window.  This only works for some applications,\n"
 "fortunately some important ones.\n"
@@ -2043,9 +2043,11 @@
 "	}\n"
 "\n"
 "	foreach piece $query_result_list {\n"
+"#puts stderr \"UMV: $piece\"\n"
 "		if {[regexp {^([^:][^:]*):(.*)$} $piece m0 item val]} {\n"
 "			if {[info exists menu_var($item)]} {\n"
 "				set old $menu_var($item)\n"
+"#puts stderr \"     $old\"\n"
 "				if {$val == \"N/A\"} {\n"
 "					continue\n"
 "				}\n"
@@ -2891,6 +2893,11 @@
 "	global bfont ffont beginner_mode simple_gui_created\n"
 "	global helptext helpremote helplabel\n"
 "\n"
+"	# some tweaks...\n"
+"	if {![info exists menu_var(deny)]} {\n"
+"		set menu_var(deny) 0\n"
+"	}\n"
+"\n"
 "	set case \"\";\n"
 "	set L_casc \"\"\n"
 "	set L_casc_count 0\n"
@@ -3240,7 +3247,14 @@
 "	global have_labelframes ffont bfont\n"
 "	global props_buttons icon_noadvanced\n"
 "\n"
-"	if ![info exists props_accept] {\n"
+"	if [info exists menu_var(deny)] {\n"
+"		if {$menu_var(deny) == $unset_str || $menu_var(deny) == 0} {\n"
+"			set props_accept 1\n"
+"		} else {\n"
+"			set props_accept 0\n"
+"		}\n"
+"	} else {\n"
+"		set menu_var(deny) 0\n"
 "		set props_accept 1\n"
 "	}\n"
 "	set prop0_accept $props_accept\n"
@@ -3735,15 +3749,18 @@
 "	global tray_embed tray_running env\n"
 "	global x11vnc_client_file client_tail client_str saved_clients_str\n"
 "	global client_balloon_id\n"
-"	global bfont sfont ffont\n"
+"	global bfont sfont snfont ffont\n"
 "	global icon_minimal gui_start_mode\n"
 "	global window_view_posted menu_var x11vnc_gui_geom\n"
 "	set min_x 24\n"
 "	set min_y 24\n"
 "	\n"
 "	set font $bfont\n"
+"	set mfont $font\n"
+"\n"
 "	if {$tray_embed} {\n"
 "		set font $sfont\n"
+"		set mfont $snfont\n"
 "	}\n"
 "	if {[info exists env(X11VNC_ICON_FONT)]} {\n"
 "		set font $env(X11VNC_ICON_FONT)\n"
@@ -3774,15 +3791,16 @@
 "	label $l -text $lab -borderwidth $bw -font $font\n"
 "	icon_win_cfg 0\n"
 "\n"
+"\n"
 "	set window_view_posted 0\n"
 "	pack $l -fill both -expand 1\n"
 "	set menu \"$l.menu\"\n"
 "	menu $menu -tearoff 0 -postcommand {set window_view_posted 0}\n"
-"	$menu add command -font $font -label \"Properties\" -command do_props\n"
-"	$menu add command -font $font -label \"Help\" -command \"menu_help Tray\"\n"
+"	$menu add command -font $mfont -label \"Properties\" -command do_props\n"
+"	$menu add command -font $mfont -label \"Help\" -command \"menu_help Tray\"\n"
 "	$menu add separator\n"
-"	$menu add command -font $font -label \"New Client\" -command do_new_client\n"
-"	$menu add command -font $font -label \"Disconnect All\" -command do_disconnect_all\n"
+"	$menu add command -font $mfont -label \"New Client\" -command do_new_client\n"
+"	$menu add command -font $mfont -label \"Disconnect All\" -command do_disconnect_all\n"
 "	$menu add separator\n"
 "\n"
 "	set wv \"$menu.casc1\"\n"
@@ -3795,9 +3813,9 @@
 "			-command \"do_var WindowView\" \\\n"
 "			-variable menu_var(WindowView)\n"
 "	}\n"
-"	$menu add cascade -font $font -label \"Window View\" -menu $wv\n"
+"	$menu add cascade -font $mfont -label \"Window View\" -menu $wv\n"
 "\n"
-"	$menu add command -font $font -label \"Stop x11vnc\" -command clean_icon_exit\n"
+"	$menu add command -font $mfont -label \"Stop x11vnc\" -command clean_icon_exit\n"
 "\n"
 "	bind $icon_win <ButtonPress-1> \"pmenu $menu %X %Y\"\n"
 "	bind $icon_win <ButtonPress-3> \"pmenu $menu %X %Y\"\n"
@@ -4704,7 +4722,7 @@
 "global all_settings reply_xdisplay always_update\n"
 "global max_text_height max_text_width\n"
 "global menu_var unset_str menus_disabled\n"
-"global bfont ffont old_labels have_labelframes\n"
+"global bfont ffont sfont snfont old_labels have_labelframes\n"
 "global connected_to_x11vnc\n"
 "global delay_sleep extra_sleep extra_sleep_split\n"
 "global cache_all_query_vars\n"