diff options
Diffstat (limited to 'x11vnc/tkx11vnc.h')
| -rw-r--r-- | x11vnc/tkx11vnc.h | 85 |
1 files changed, 64 insertions, 21 deletions
diff --git a/x11vnc/tkx11vnc.h b/x11vnc/tkx11vnc.h index e756f18..7b432d7 100644 --- a/x11vnc/tkx11vnc.h +++ b/x11vnc/tkx11vnc.h @@ -136,7 +136,8 @@ char gui_code[] = ""; " vncconnect\n" " avahi\n" " -- D\n" -" filexfer\n" +" tightfilexfer\n" +" ultrafilexfer\n" " =GAL Java-applet::\n" " =D http\n" " httpdir:\n" @@ -269,6 +270,7 @@ char gui_code[] = ""; " nofb\n" " =D nobell\n" " nolookup\n" +" rfbversion:\n" " bg\n" " =S loop\n" " =S loopbg\n" @@ -590,6 +592,9 @@ char gui_code[] = ""; "Allows you to find more information about them, change their input\n" "permissions, or disconnect them.\n" "\n" +"Note that the File transfer permission only applies to UltraVNC\n" +"file transfer, not TightVNC file transfer.\n" +"\n" "You will be prompted to confirm any disconnections.\n" "\"\n" "\n" @@ -603,9 +608,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, Button-Clicks, or\n" -"Clipboard-Input checkboxes and pressing \\\"OK\\\". This is like the\n" -"\\\"-input\\\" option but on a per-client basis.\n" +"by selecting any of the Keystrokes, Mouse-Motion, Button-Click,\n" +"Clipboard-Input, or Files checkboxes and pressing \\\"OK\\\". This is like\n" +"the \\\"-input\\\" option but on a per-client basis.\n" "\n" "To not change any aspects of the VNC client press \\\"Cancel\\\".\n" "\"\n" @@ -2034,7 +2039,7 @@ char gui_code[] = ""; "}\n" "\n" "proc set_kmbc_str {} {\n" -" global vl_bk vl_bm vl_bb vl_bc vr_bk vr_bm vr_bb vr_bc\n" +" global vl_bk vl_bm vl_bb vl_bc vl_bf vr_bk vr_bm vr_bb vr_bc vr_bf\n" "\n" " set str \"\"\n" " if {$vl_bk} {\n" @@ -2049,7 +2054,10 @@ char gui_code[] = ""; " if {$vl_bc} {\n" " append str \"C\"\n" " }\n" -" if {$vr_bk || $vr_bm || $vr_bb || $vr_bc} {\n" +" if {$vl_bf} {\n" +" append str \"F\"\n" +" }\n" +" if {$vr_bk || $vr_bm || $vr_bb || $vr_bc || $vr_bf} {\n" " append str \",\"\n" " }\n" " if {$vr_bk} {\n" @@ -2064,16 +2072,19 @@ char gui_code[] = ""; " if {$vr_bc} {\n" " append str \"C\"\n" " }\n" +" if {$vr_bf} {\n" +" append str \"F\"\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 vl_bc vr_bk vr_bm vr_bb vr_bc\n" +" global vl_bk vl_bm vl_bb vl_bc vl_bf vr_bk vr_bm vr_bb vr_bc vr_bf\n" "\n" " append_text \"\\nUse these checkboxes to set the input permissions, \"\n" -" append_text \"or type in the \\\"KMBC...\\\"\\n\"\n" +" append_text \"or type in the \\\"KMBCF...\\\"\\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" @@ -2090,18 +2101,22 @@ char gui_code[] = ""; " checkbutton $fl.bm -font $ffont -anchor w -variable vl_bm \\\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_kmbc_str -text \"Button-Clicks\"\n" +" -pady 1 -command set_kmbc_str -text \"Button-Click\"\n" " checkbutton $fl.bc -font $ffont -anchor w -variable vl_bc \\\n" " -pady 1 -command set_kmbc_str -text \"Clipboard-Input\"\n" +" checkbutton $fl.bf -font $ffont -anchor w -variable vl_bf \\\n" +" -pady 1 -command set_kmbc_str -text \"Files\"\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_kmbc_str -text \"Keystrokes\" \n" " checkbutton $fr.bm -font $ffont -anchor w -variable vr_bm \\\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_kmbc_str -text \"Button-Clicks\"\n" +" -pady 1 -command set_kmbc_str -text \"Button-Click\"\n" " checkbutton $fr.bc -font $ffont -anchor w -variable vr_bc \\\n" " -pady 1 -command set_kmbc_str -text \"Clipboard-Input\"\n" +" checkbutton $fr.bf -font $ffont -anchor w -variable vr_bf \\\n" +" -pady 1 -command set_kmbc_str -text \"Files\"\n" "\n" " if {[info exists menu_var(input)]} {\n" " set input_str $menu_var(input)\n" @@ -2119,10 +2134,13 @@ char gui_code[] = ""; " set vl_bm 0\n" " set vl_bb 0\n" " set vl_bc 0\n" +" set vl_bf 0\n" +"\n" " set vr_bk 0\n" " set vr_bm 0\n" " set vr_bb 0\n" " set vr_bc 0\n" +" set vr_bf 0\n" "\n" " if {[regexp -nocase {K} $normal]} {\n" " set vl_bk 1\n" @@ -2136,6 +2154,9 @@ char gui_code[] = ""; " if {[regexp -nocase {C} $normal]} {\n" " set vl_bc 1\n" " }\n" +" if {[regexp -nocase {F} $normal]} {\n" +" set vl_bf 1\n" +" }\n" " if {[regexp -nocase {K} $viewonly]} {\n" " set vr_bk 1\n" " }\n" @@ -2148,9 +2169,12 @@ char gui_code[] = ""; " if {[regexp -nocase {C} $viewonly]} {\n" " set vr_bc 1\n" " }\n" +" if {[regexp -nocase {F} $viewonly]} {\n" +" set vr_bf 1\n" +" }\n" "\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.l $fl.bk $fl.bm $fl.bb $fl.bc $fl.bf -side top -fill x\n" +" pack $fr.l $fr.bk $fr.bm $fr.bb $fr.bc $fr.bf -side top -fill x\n" " pack $fl $fr -side left\n" " update\n" " update idletasks\n" @@ -2163,7 +2187,7 @@ char gui_code[] = ""; "}\n" "\n" "proc set_ca_str {w} {\n" -" global ca_bk ca_bm ca_bb ca_bc ca_di\n" +" global ca_bk ca_bm ca_bb ca_bc ca_bf ca_di\n" "\n" " if {$ca_di} {\n" " entry_insert \"disconnect\"\n" @@ -2171,6 +2195,7 @@ char gui_code[] = ""; " $w.bm configure -state disabled\n" " $w.bb configure -state disabled\n" " $w.bc configure -state disabled\n" +" $w.bf configure -state disabled\n" " return\n" " }\n" "\n" @@ -2178,6 +2203,7 @@ char gui_code[] = ""; " $w.bm configure -state normal\n" " $w.bb configure -state normal\n" " $w.bc configure -state normal\n" +" $w.bf configure -state normal\n" "\n" " set str \"\"\n" " if {$ca_bk} {\n" @@ -2192,13 +2218,16 @@ char gui_code[] = ""; " if {$ca_bc} {\n" " append str \"C\"\n" " }\n" +" if {$ca_bf} {\n" +" append str \"F\"\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_bc ca_di\n" +" global ca_bk ca_bm ca_bb ca_bc ca_bf 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" @@ -2207,20 +2236,23 @@ char gui_code[] = ""; " catch {destroy $w}\n" " frame $w -bd 1 -relief ridge -cursor {top_left_arrow}\n" " checkbutton $w.di -pady 1 -font $ffont -anchor w -variable ca_di \\\n" -" -pady 1 -command \"set_ca_str $w\" -text \"Disconnect \" \n" +" -pady 1 -command \"set_ca_str $w\" -text \"Disconnect \" \n" " 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" " 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-Click\"\n" " checkbutton $w.bc -font $ffont -anchor w -variable ca_bc \\\n" " -pady 1 -command \"set_ca_str $w\" -text \"Clipboard\"\n" +" checkbutton $w.bf -font $ffont -anchor w -variable ca_bf \\\n" +" -pady 1 -command \"set_ca_str $w\" -text \"Files\"\n" "\n" " set ca_di 0\n" " set ca_bk 0\n" " set ca_bm 0\n" " set ca_bb 0\n" +" set ca_bf 0\n" " set ca_bc 0\n" "\n" " if {[regexp -nocase {K} $input]} {\n" @@ -2235,8 +2267,11 @@ char gui_code[] = ""; " if {[regexp -nocase {C} $input]} {\n" " set ca_bc 1\n" " }\n" +" if {[regexp -nocase {F} $input]} {\n" +" set ca_bf 1\n" +" }\n" "\n" -" pack $w.di $w.bk $w.bm $w.bb $w.bc -side left\n" +" pack $w.di $w.bk $w.bm $w.bb $w.bc $w.bf -side left\n" " update\n" " update idletasks\n" " $text_area window create end -window $w\n" @@ -3422,6 +3457,7 @@ char gui_code[] = ""; " set sm 0\n" " set sb 0\n" " set sc 0\n" +" set sf 0\n" " if {[regexp -nocase {K} $input]} {\n" " append_text \"Keystrokes\"\n" " set sk 1\n" @@ -3437,7 +3473,7 @@ char gui_code[] = ""; " if {$sk || $sm} {\n" " append_text \", \"\n" " }\n" -" append_text \"Button-Clicks\"\n" +" append_text \"Button-Click\"\n" " set sb 1\n" " }\n" " if {[regexp -nocase {C} $input]} {\n" @@ -3447,7 +3483,14 @@ char gui_code[] = ""; " append_text \"Clipboard\"\n" " set sm 1\n" " }\n" -" if {! $sk && ! $sm && ! $sb && ! $sm} {\n" +" if {[regexp -nocase {F} $input]} {\n" +" if {$sk || $sm || $sb || $sf} {\n" +" append_text \", \"\n" +" }\n" +" append_text \"Files\"\n" +" set sf 1\n" +" }\n" +" if {! $sk && ! $sm && ! $sb && ! $sm && ! $sf} {\n" " append_text \"None\"\n" " }\n" " append_text \"\\n\"\n" @@ -3474,7 +3517,7 @@ char gui_code[] = ""; " } elseif {[regexp -nocase {(disconnect|close)} $val]} {\n" " disconnect_dialog $client\n" " } else {\n" -" regsub -all -nocase {[^KMBC]} $val \"\" val\n" +" regsub -all -nocase {[^KMBCF]} $val \"\" val\n" " set item_bool(client_input) 0\n" " push_new_value \"client_input\" \"client_input\" \"$cid:$val\" 0\n" " }\n" @@ -5218,7 +5261,7 @@ char gui_code[] = ""; "\n" "\n" " # Make the top label\n" -" set label_width 80\n" +" set label_width 84\n" " if {$screen_width <= 400} {\n" " set label_width 64\n" " }\n" |