x11vnc: fix some -QD cases for use in tkx11vnc.

1 files changed, 40 insertions, 4 deletions

diff --git a/x11vnc/tkx11vnc b/x11vnc/tkx11vnc
index 6071d84..edd07b7 100755
--- a/x11vnc/tkx11vnc
+++ b/x11vnc/tkx11vnc
@@ -148,7 +148,7 @@ Displays
 	=S reflect:
 	=D desktop:
 	=D rfbport:
-	=S autoport
+	=S autoport:
 	=0 gui:
 
 Screen
@@ -254,7 +254,7 @@ Misc
 	=GAL LOFF
 	=GAL X-ext::
 	xtrap
-	xrecord
+	noxrecord
 	=RQA reset_record
 	=GAL LOFF
 	=GAL MacOSX::
@@ -2535,8 +2535,38 @@ proc get_default_vars {} {
 
 	append qry ",vncconnect"
 
-	set qargs [list "-QD" $qry]
-	set all [run_remote_cmd $qargs]
+	set q ""
+	set i 0
+	set all ""
+	foreach s [split $qry ","] {
+		if {$q != ""} {
+			append q ","
+		}
+		append q $s
+		incr i
+		if {$i > 50} {
+			set qargs [list "-QD" $q]
+			set a [run_remote_cmd $qargs]
+			if {$all != ""} {
+				append all ","
+			}
+			append all $a
+			set q ""
+			set i 0
+		}
+	}
+	if {$q != ""} {
+		set qargs [list "-QD" $q]
+		set a [run_remote_cmd $qargs]
+		if {$all != ""} {
+			append all ","
+		}
+		append all $a
+	}
+
+# old way, qry too long...
+#	set qargs [list "-QD" $qry]
+#	set all [run_remote_cmd $qargs]
 
 	if {[regexp {ans=} $all]} {
 		#append_text "Retrieved all default settings.\n"
@@ -5870,6 +5900,10 @@ proc get_settings_rcfile {} {
 			continue
 		} elseif {$item == "rc" || $item == "norc"} {
 			continue
+		} elseif {$item == "loop"} {
+			continue
+		} elseif {$item == "loopbg"} {
+			continue
 		}
 
 		set def ""
@@ -5877,6 +5911,7 @@ proc get_settings_rcfile {} {
 			set def $default_var($item)
 		}
 
+
 		set qst ""
 		set hmm "#? "
 		if {$item == "display"} {
@@ -5896,6 +5931,7 @@ proc get_settings_rcfile {} {
 		} else {
 			set mv $menu_var($item)
 		}
+#puts "item=$item def=$def mv=$mv"
 		if {$mv == $unset_str} {
 			set mv ""
 		}