x11vnc: -unixpw and -stunnel. Add clipboard to input control.

1 files changed, 62 insertions, 25 deletions

diff --git a/x11vnc/tkx11vnc.h b/x11vnc/tkx11vnc.h
index bd829d3..a39f0c5 100644
--- a/x11vnc/tkx11vnc.h
+++ b/x11vnc/tkx11vnc.h
@@ -513,9 +513,9 @@ char gui_code[] = "";
 "confirmation dialog to doublecheck.\n"
 "\n"
 "Alternatively, you can fine tune the VNC client's input permissions\n"
-"by selecting any of the Keystrokes, Mouse Motion, or Button Clicks\n"
-"checkboxes and pressing \\\"OK\\\".  This is like the \\\"-input\\\" option\n"
-"but on a per-client basis.\n"
+"by selecting any of the Keystrokes, Mouse-Motion, Button-Clicks, or\n"
+"Clipboard-Input checkboxes and pressing \\\"OK\\\".  This is like the\n"
+"\\\"-input\\\" option but on a per-client basis.\n"
 "\n"
 "To not change any aspects of the VNC client press \\\"Cancel\\\".\n"
 "\"\n"
@@ -1860,8 +1860,8 @@ char gui_code[] = "";
 "	}\n"
 "}\n"
 "\n"
-"proc set_kmb_str {} {\n"
-"	global vl_bk vl_bm vl_bb vr_bk vr_bm vr_bb \n"
+"proc set_kmbc_str {} {\n"
+"	global vl_bk vl_bm vl_bb vl_bc vr_bk vr_bm vr_bb vr_bc\n"
 "\n"
 "	set str \"\"\n"
 "	if {$vl_bk} {\n"
@@ -1873,7 +1873,10 @@ char gui_code[] = "";
 "	if {$vl_bb} {\n"
 "		append str \"B\"\n"
 "	}\n"
-"	if {$vr_bk || $vr_bm || $vr_bb} {\n"
+"	if {$vl_bc} {\n"
+"		append str \"C\"\n"
+"	}\n"
+"	if {$vr_bk || $vr_bm || $vr_bb || $vr_bc} {\n"
 "		append str \",\"\n"
 "	}\n"
 "	if {$vr_bk} {\n"
@@ -1885,16 +1888,19 @@ char gui_code[] = "";
 "	if {$vr_bb} {\n"
 "		append str \"B\"\n"
 "	}\n"
+"	if {$vr_bc} {\n"
+"		append str \"C\"\n"
+"	}\n"
 "	entry_insert $str\n"
 "}\n"
 "\n"
 "proc insert_input_window {} {\n"
 "	global text_area cleanup_window\n"
 "	global ffont menu_var\n"
-"	global vl_bk vl_bm vl_bb vr_bk vr_bm vr_bb \n"
+"	global vl_bk vl_bm vl_bb vl_bc vr_bk vr_bm vr_bb vr_bc\n"
 "\n"
 "	append_text \"\\nUse these checkboxes to set the input permissions, \"\n"
-"	append_text \"or type in the \\\"KMB...\\\"\\n\"\n"
+"	append_text \"or type in the \\\"KMBC...\\\"\\n\"\n"
 "	append_text \"-input string manually.  Then press \\\"OK\\\" or \\\"Cancel\\\".\\n\"\n"
 "	append_text \"(note: an empty setting means use the default behavior, \"\n"
 "	append_text \"see viewonly)\\n\\n\"\n"
@@ -1907,18 +1913,22 @@ char gui_code[] = "";
 "	frame $fr\n"
 "	label $fl.l -font $ffont -text \"Normal clients:   \"\n"
 "	checkbutton $fl.bk -pady 1 -font $ffont -anchor w -variable vl_bk \\\n"
-"		-pady 1 -command set_kmb_str -text \"Keystrokes\" \n"
+"		-pady 1 -command set_kmbc_str -text \"Keystrokes\" \n"
 "	checkbutton $fl.bm -font $ffont -anchor w -variable vl_bm \\\n"
-"		-pady 1 -command set_kmb_str -text \"Mouse Motion\" \n"
+"		-pady 1 -command set_kmbc_str -text \"Mouse-Motion\" \n"
 "	checkbutton $fl.bb -font $ffont -anchor w -variable vl_bb \\\n"
-"		-pady 1 -command set_kmb_str -text \"Button Clicks\"\n"
+"		-pady 1 -command set_kmbc_str -text \"Button-Clicks\"\n"
+"	checkbutton $fl.bc -font $ffont -anchor w -variable vl_bc \\\n"
+"		-pady 1 -command set_kmbc_str -text \"Clipboard-Input\"\n"
 "	label $fr.l -pady 1 -font $ffont -text \"View-Only clients:\"\n"
 "	checkbutton $fr.bk -font $ffont -anchor w -variable vr_bk \\\n"
-"		-pady 1 -command set_kmb_str -text \"Keystrokes\" \n"
+"		-pady 1 -command set_kmbc_str -text \"Keystrokes\" \n"
 "	checkbutton $fr.bm -font $ffont -anchor w -variable vr_bm \\\n"
-"		-pady 1 -command set_kmb_str -text \"Mouse Motion\" \n"
+"		-pady 1 -command set_kmbc_str -text \"Mouse-Motion\" \n"
 "	checkbutton $fr.bb -font $ffont -anchor w -variable vr_bb \\\n"
-"		-pady 1 -command set_kmb_str -text \"Button Clicks\"\n"
+"		-pady 1 -command set_kmbc_str -text \"Button-Clicks\"\n"
+"	checkbutton $fr.bc -font $ffont -anchor w -variable vr_bc \\\n"
+"		-pady 1 -command set_kmbc_str -text \"Clipboard-Input\"\n"
 "\n"
 "	if {[info exists menu_var(input)]} {\n"
 "		set input_str $menu_var(input)\n"
@@ -1935,9 +1945,11 @@ char gui_code[] = "";
 "	set vl_bk 0\n"
 "	set vl_bm 0\n"
 "	set vl_bb 0\n"
+"	set vl_bc 0\n"
 "	set vr_bk 0\n"
 "	set vr_bm 0\n"
 "	set vr_bb 0\n"
+"	set vr_bc 0\n"
 "\n"
 "	if {[regexp -nocase {K} $normal]} {\n"
 "		set vl_bk 1\n"
@@ -1948,6 +1960,9 @@ char gui_code[] = "";
 "	if {[regexp -nocase {B} $normal]} {\n"
 "		set vl_bb 1\n"
 "	}\n"
+"	if {[regexp -nocase {C} $normal]} {\n"
+"		set vl_bc 1\n"
+"	}\n"
 "	if {[regexp -nocase {K} $viewonly]} {\n"
 "		set vr_bk 1\n"
 "	}\n"
@@ -1957,9 +1972,12 @@ char gui_code[] = "";
 "	if {[regexp -nocase {B} $viewonly]} {\n"
 "		set vr_bb 1\n"
 "	}\n"
+"	if {[regexp -nocase {C} $viewonly]} {\n"
+"		set vr_bc 1\n"
+"	}\n"
 "\n"
-"	pack $fl.l $fl.bk $fl.bm $fl.bb -side top -fill x\n"
-"	pack $fr.l $fr.bk $fr.bm $fr.bb -side top -fill x\n"
+"	pack $fl.l $fl.bk $fl.bm $fl.bb $fl.bc -side top -fill x\n"
+"	pack $fr.l $fr.bk $fr.bm $fr.bb $fr.bc -side top -fill x\n"
 "	pack $fl $fr -side left\n"
 "	update\n"
 "	update idletasks\n"
@@ -1972,19 +1990,21 @@ char gui_code[] = "";
 "}\n"
 "\n"
 "proc set_ca_str {w} {\n"
-"	global ca_bk ca_bm ca_bb ca_bk ca_di\n"
+"	global ca_bk ca_bm ca_bb ca_bc ca_di\n"
 "\n"
 "	if {$ca_di} {\n"
 "		entry_insert \"disconnect\"\n"
 "		$w.bk configure -state disabled\n"
 "		$w.bm configure -state disabled\n"
 "		$w.bb configure -state disabled\n"
+"		$w.bc configure -state disabled\n"
 "		return\n"
 "	}\n"
 "\n"
 "	$w.bk configure -state normal\n"
 "	$w.bm configure -state normal\n"
 "	$w.bb configure -state normal\n"
+"	$w.bc configure -state normal\n"
 "\n"
 "	set str \"\"\n"
 "	if {$ca_bk} {\n"
@@ -1996,13 +2016,16 @@ char gui_code[] = "";
 "	if {$ca_bb} {\n"
 "		append str \"B\"\n"
 "	}\n"
+"	if {$ca_bc} {\n"
+"		append str \"C\"\n"
+"	}\n"
 "	entry_insert $str\n"
 "}\n"
 "\n"
 "proc insert_client_action_window {input} {\n"
 "	global text_area cleanup_window\n"
 "	global ffont menu_var\n"
-"	global ca_bk ca_bm ca_bb ca_bk ca_di\n"
+"	global ca_bk ca_bm ca_bb ca_bc ca_di\n"
 "\n"
 "	append_text \"\\nUse these checkboxes to set the input permissions \"\n"
 "	append_text \"for this client\\n-OR- whether to disconnect it instead.  \"\n"
@@ -2015,14 +2038,17 @@ char gui_code[] = "";
 "	checkbutton $w.bk -font $ffont -anchor w -variable ca_bk \\\n"
 "		-pady 1 -command \"set_ca_str $w\" -text \"Keystrokes\" \n"
 "	checkbutton $w.bm -font $ffont -anchor w -variable ca_bm \\\n"
-"		-pady 1 -command \"set_ca_str $w\" -text \"Mouse Motion\" \n"
+"		-pady 1 -command \"set_ca_str $w\" -text \"Mouse-Motion\" \n"
 "	checkbutton $w.bb -font $ffont -anchor w -variable ca_bb \\\n"
-"		-pady 1 -command \"set_ca_str $w\" -text \"Button Clicks\"\n"
+"		-pady 1 -command \"set_ca_str $w\" -text \"Button-Clicks\"\n"
+"	checkbutton $w.bc -font $ffont -anchor w -variable ca_bc \\\n"
+"		-pady 1 -command \"set_ca_str $w\" -text \"Clipboard\"\n"
 "\n"
 "	set ca_di 0\n"
 "	set ca_bk 0\n"
 "	set ca_bm 0\n"
 "	set ca_bb 0\n"
+"	set ca_bc 0\n"
 "\n"
 "	if {[regexp -nocase {K} $input]} {\n"
 "		set ca_bk 1\n"
@@ -2033,8 +2059,11 @@ char gui_code[] = "";
 "	if {[regexp -nocase {B} $input]} {\n"
 "		set ca_bb 1\n"
 "	}\n"
+"	if {[regexp -nocase {C} $input]} {\n"
+"		set ca_bc 1\n"
+"	}\n"
 "\n"
-"	pack $w.di $w.bk $w.bm $w.bb -side left\n"
+"	pack $w.di $w.bk $w.bm $w.bb $w.bc -side left\n"
 "	update\n"
 "	update idletasks\n"
 "	$text_area window create end -window $w\n"
@@ -3199,16 +3228,17 @@ char gui_code[] = "";
 "		set input $m6\n"
 "		set logvo $m7\n"
 "		append_text \"Host: $host, Port: $port, User: $user, IP: $ip, Id: $cid\\n\"\n"
-"		append_text \"    - originally logged in as:  \"\n"
+"		append_text \" - originally logged in as: \"\n"
 "		if {$logvo == \"1\" } {\n"
 "			append_text \"View-Only Client\\n\"\n"
 "		} else {\n"
 "			append_text \"Normal Client\\n\"\n"
 "		}\n"
-"		append_text \"    - currently allowed input:  \"\n"
+"		append_text \" - currently allowed input: \"\n"
 "		set sk 0\n"
 "		set sm 0\n"
 "		set sb 0\n"
+"		set sc 0\n"
 "		if {[regexp -nocase {K} $input]} {\n"
 "			append_text \"Keystrokes\"\n"
 "			set sk 1\n"
@@ -3227,7 +3257,14 @@ char gui_code[] = "";
 "			append_text \"Button-Clicks\"\n"
 "			set sb 1\n"
 "		}\n"
-"		if {! $sk && ! $sm && ! $sb} {\n"
+"		if {[regexp -nocase {C} $input]} {\n"
+"			if {$sk || $sm || $sb} {\n"
+"				append_text \", \"\n"
+"			}\n"
+"			append_text \"Clipboard\"\n"
+"			set sm 1\n"
+"		}\n"
+"		if {! $sk && ! $sm && ! $sb && ! $sm} {\n"
 "			append_text \"None\"\n"
 "		}\n"
 "		append_text \"\\n\"\n"
@@ -3254,7 +3291,7 @@ char gui_code[] = "";
 "	} elseif {[regexp -nocase {(disconnect|close)} $val]} {\n"
 "		disconnect_dialog $client\n"
 "	} else {\n"
-"		regsub -all -nocase {[^KMB]} $val \"\" val\n"
+"		regsub -all -nocase {[^KMBC]} $val \"\" val\n"
 "		set item_bool(client_input) 0\n"
 "		push_new_value \"client_input\" \"client_input\" \"$cid:$val\" 0\n"
 "	}\n"