x11vnc: add Files mode to user controlled input. more ultra/tight filexfer tweaks. rfbversion remote control. noncache/nc unixpw user opt.

1 files changed, 64 insertions, 21 deletions

diff --git a/x11vnc/tkx11vnc b/x11vnc/tkx11vnc
index b0e14de..eba179f 100755
--- a/x11vnc/tkx11vnc
+++ b/x11vnc/tkx11vnc
@@ -125,7 +125,8 @@ Clients
 	vncconnect
 	avahi
 	-- D
-	filexfer
+	tightfilexfer
+	ultrafilexfer
 	=GAL Java-applet::
 	=D http
 	httpdir:
@@ -258,6 +259,7 @@ Misc
 	nofb
 	=D nobell
 	nolookup
+	rfbversion:
 	bg
 	=S loop
 	=S loopbg
@@ -579,6 +581,9 @@ Shows a menu of currently connected VNC clients on the x11vnc server.
 Allows you to find more information about them, change their input
 permissions, or disconnect them.
 
+Note that the File transfer permission only applies to UltraVNC
+file transfer, not TightVNC file transfer.
+
 You will be prompted to confirm any disconnections.
 "
 
@@ -592,9 +597,9 @@ You can choose to disconnect the client by clicking on the
 confirmation dialog to doublecheck.
 
 Alternatively, you can fine tune the VNC client's input permissions
-by selecting any of the Keystrokes, Mouse-Motion, Button-Clicks, or
-Clipboard-Input checkboxes and pressing \"OK\".  This is like the
-\"-input\" option but on a per-client basis.
+by selecting any of the Keystrokes, Mouse-Motion, Button-Click,
+Clipboard-Input, or Files checkboxes and pressing \"OK\".  This is like
+the \"-input\" option but on a per-client basis.
 
 To not change any aspects of the VNC client press \"Cancel\".
 "
@@ -2023,7 +2028,7 @@ proc push_new_value {item name new {query 1}} {
 }
 
 proc set_kmbc_str {} {
-	global vl_bk vl_bm vl_bb vl_bc vr_bk vr_bm vr_bb vr_bc
+	global vl_bk vl_bm vl_bb vl_bc vl_bf vr_bk vr_bm vr_bb vr_bc vr_bf
 
 	set str ""
 	if {$vl_bk} {
@@ -2038,7 +2043,10 @@ proc set_kmbc_str {} {
 	if {$vl_bc} {
 		append str "C"
 	}
-	if {$vr_bk || $vr_bm || $vr_bb || $vr_bc} {
+	if {$vl_bf} {
+		append str "F"
+	}
+	if {$vr_bk || $vr_bm || $vr_bb || $vr_bc || $vr_bf} {
 		append str ","
 	}
 	if {$vr_bk} {
@@ -2053,16 +2061,19 @@ proc set_kmbc_str {} {
 	if {$vr_bc} {
 		append str "C"
 	}
+	if {$vr_bf} {
+		append str "F"
+	}
 	entry_insert $str
 }
 
 proc insert_input_window {} {
 	global text_area cleanup_window
 	global ffont menu_var
-	global vl_bk vl_bm vl_bb vl_bc vr_bk vr_bm vr_bb vr_bc
+	global vl_bk vl_bm vl_bb vl_bc vl_bf vr_bk vr_bm vr_bb vr_bc vr_bf
 
 	append_text "\nUse these checkboxes to set the input permissions, "
-	append_text "or type in the \"KMBC...\"\n"
+	append_text "or type in the \"KMBCF...\"\n"
 	append_text "-input string manually.  Then press \"OK\" or \"Cancel\".\n"
 	append_text "(note: an empty setting means use the default behavior, "
 	append_text "see viewonly)\n\n"
@@ -2079,18 +2090,22 @@ proc insert_input_window {} {
 	checkbutton $fl.bm -font $ffont -anchor w -variable vl_bm \
 		-pady 1 -command set_kmbc_str -text "Mouse-Motion" 
 	checkbutton $fl.bb -font $ffont -anchor w -variable vl_bb \
-		-pady 1 -command set_kmbc_str -text "Button-Clicks"
+		-pady 1 -command set_kmbc_str -text "Button-Click"
 	checkbutton $fl.bc -font $ffont -anchor w -variable vl_bc \
 		-pady 1 -command set_kmbc_str -text "Clipboard-Input"
+	checkbutton $fl.bf -font $ffont -anchor w -variable vl_bf \
+		-pady 1 -command set_kmbc_str -text "Files"
 	label $fr.l -pady 1 -font $ffont -text "View-Only clients:"
 	checkbutton $fr.bk -font $ffont -anchor w -variable vr_bk \
 		-pady 1 -command set_kmbc_str -text "Keystrokes" 
 	checkbutton $fr.bm -font $ffont -anchor w -variable vr_bm \
 		-pady 1 -command set_kmbc_str -text "Mouse-Motion" 
 	checkbutton $fr.bb -font $ffont -anchor w -variable vr_bb \
-		-pady 1 -command set_kmbc_str -text "Button-Clicks"
+		-pady 1 -command set_kmbc_str -text "Button-Click"
 	checkbutton $fr.bc -font $ffont -anchor w -variable vr_bc \
 		-pady 1 -command set_kmbc_str -text "Clipboard-Input"
+	checkbutton $fr.bf -font $ffont -anchor w -variable vr_bf \
+		-pady 1 -command set_kmbc_str -text "Files"
 
 	if {[info exists menu_var(input)]} {
 		set input_str $menu_var(input)
@@ -2108,10 +2123,13 @@ proc insert_input_window {} {
 	set vl_bm 0
 	set vl_bb 0
 	set vl_bc 0
+	set vl_bf 0
+
 	set vr_bk 0
 	set vr_bm 0
 	set vr_bb 0
 	set vr_bc 0
+	set vr_bf 0
 
 	if {[regexp -nocase {K} $normal]} {
 		set vl_bk 1
@@ -2125,6 +2143,9 @@ proc insert_input_window {} {
 	if {[regexp -nocase {C} $normal]} {
 		set vl_bc 1
 	}
+	if {[regexp -nocase {F} $normal]} {
+		set vl_bf 1
+	}
 	if {[regexp -nocase {K} $viewonly]} {
 		set vr_bk 1
 	}
@@ -2137,9 +2158,12 @@ proc insert_input_window {} {
 	if {[regexp -nocase {C} $viewonly]} {
 		set vr_bc 1
 	}
+	if {[regexp -nocase {F} $viewonly]} {
+		set vr_bf 1
+	}
 
-	pack $fl.l $fl.bk $fl.bm $fl.bb $fl.bc -side top -fill x
-	pack $fr.l $fr.bk $fr.bm $fr.bb $fr.bc -side top -fill x
+	pack $fl.l $fl.bk $fl.bm $fl.bb $fl.bc $fl.bf -side top -fill x
+	pack $fr.l $fr.bk $fr.bm $fr.bb $fr.bc $fr.bf -side top -fill x
 	pack $fl $fr -side left
 	update
 	update idletasks
@@ -2152,7 +2176,7 @@ proc insert_input_window {} {
 }
 
 proc set_ca_str {w} {
-	global ca_bk ca_bm ca_bb ca_bc ca_di
+	global ca_bk ca_bm ca_bb ca_bc ca_bf ca_di
 
 	if {$ca_di} {
 		entry_insert "disconnect"
@@ -2160,6 +2184,7 @@ proc set_ca_str {w} {
 		$w.bm configure -state disabled
 		$w.bb configure -state disabled
 		$w.bc configure -state disabled
+		$w.bf configure -state disabled
 		return
 	}
 
@@ -2167,6 +2192,7 @@ proc set_ca_str {w} {
 	$w.bm configure -state normal
 	$w.bb configure -state normal
 	$w.bc configure -state normal
+	$w.bf configure -state normal
 
 	set str ""
 	if {$ca_bk} {
@@ -2181,13 +2207,16 @@ proc set_ca_str {w} {
 	if {$ca_bc} {
 		append str "C"
 	}
+	if {$ca_bf} {
+		append str "F"
+	}
 	entry_insert $str
 }
 
 proc insert_client_action_window {input} {
 	global text_area cleanup_window
 	global ffont menu_var
-	global ca_bk ca_bm ca_bb ca_bc ca_di
+	global ca_bk ca_bm ca_bb ca_bc ca_bf ca_di
 
 	append_text "\nUse these checkboxes to set the input permissions "
 	append_text "for this client\n-OR- whether to disconnect it instead.  "
@@ -2196,20 +2225,23 @@ proc insert_client_action_window {input} {
 	catch {destroy $w}
 	frame $w -bd 1 -relief ridge -cursor {top_left_arrow}
 	checkbutton $w.di -pady 1 -font $ffont -anchor w -variable ca_di \
-		-pady 1 -command "set_ca_str $w" -text "Disconnect    " 
+		-pady 1 -command "set_ca_str $w" -text "Disconnect  " 
 	checkbutton $w.bk -font $ffont -anchor w -variable ca_bk \
 		-pady 1 -command "set_ca_str $w" -text "Keystrokes" 
 	checkbutton $w.bm -font $ffont -anchor w -variable ca_bm \
 		-pady 1 -command "set_ca_str $w" -text "Mouse-Motion" 
 	checkbutton $w.bb -font $ffont -anchor w -variable ca_bb \
-		-pady 1 -command "set_ca_str $w" -text "Button-Clicks"
+		-pady 1 -command "set_ca_str $w" -text "Button-Click"
 	checkbutton $w.bc -font $ffont -anchor w -variable ca_bc \
 		-pady 1 -command "set_ca_str $w" -text "Clipboard"
+	checkbutton $w.bf -font $ffont -anchor w -variable ca_bf \
+		-pady 1 -command "set_ca_str $w" -text "Files"
 
 	set ca_di 0
 	set ca_bk 0
 	set ca_bm 0
 	set ca_bb 0
+	set ca_bf 0
 	set ca_bc 0
 
 	if {[regexp -nocase {K} $input]} {
@@ -2224,8 +2256,11 @@ proc insert_client_action_window {input} {
 	if {[regexp -nocase {C} $input]} {
 		set ca_bc 1
 	}
+	if {[regexp -nocase {F} $input]} {
+		set ca_bf 1
+	}
 
-	pack $w.di $w.bk $w.bm $w.bb $w.bc -side left
+	pack $w.di $w.bk $w.bm $w.bb $w.bc $w.bf -side left
 	update
 	update idletasks
 	$text_area window create end -window $w
@@ -3411,6 +3446,7 @@ proc client_dialog {client} {
 		set sm 0
 		set sb 0
 		set sc 0
+		set sf 0
 		if {[regexp -nocase {K} $input]} {
 			append_text "Keystrokes"
 			set sk 1
@@ -3426,7 +3462,7 @@ proc client_dialog {client} {
 			if {$sk || $sm} {
 				append_text ", "
 			}
-			append_text "Button-Clicks"
+			append_text "Button-Click"
 			set sb 1
 		}
 		if {[regexp -nocase {C} $input]} {
@@ -3436,7 +3472,14 @@ proc client_dialog {client} {
 			append_text "Clipboard"
 			set sm 1
 		}
-		if {! $sk && ! $sm && ! $sb && ! $sm} {
+		if {[regexp -nocase {F} $input]} {
+			if {$sk || $sm || $sb || $sf} {
+				append_text ", "
+			}
+			append_text "Files"
+			set sf 1
+		}
+		if {! $sk && ! $sm && ! $sb && ! $sm && ! $sf} {
 			append_text "None"
 		}
 		append_text "\n"
@@ -3463,7 +3506,7 @@ proc client_dialog {client} {
 	} elseif {[regexp -nocase {(disconnect|close)} $val]} {
 		disconnect_dialog $client
 	} else {
-		regsub -all -nocase {[^KMBC]} $val "" val
+		regsub -all -nocase {[^KMBCF]} $val "" val
 		set item_bool(client_input) 0
 		push_new_value "client_input" "client_input" "$cid:$val" 0
 	}
@@ -5207,7 +5250,7 @@ proc make_widgets {top} {
 
 
 	# Make the top label
-	set label_width 80
+	set label_width 84
 	if {$screen_width <= 400} {
 		set label_width 64
 	}