diff options
| author | runge <runge> | 2008-05-08 01:23:45 +0000 |
|---|---|---|
| committer | runge <runge> | 2008-05-08 01:23:45 +0000 |
| commit | abbdf92a704790374a12d6da5125b4e95595aaac (patch) | |
| tree | 55fdb539e7b9d2e0447668f1dad77c96df22aeb1 /x11vnc/tkx11vnc.h | |
| parent | d8812f8c85fcd83412c6ad275d10ce1c43f22240 (diff) | |
| download | libtdevnc-abbdf92a704790374a12d6da5125b4e95595aaac.tar.gz libtdevnc-abbdf92a704790374a12d6da5125b4e95595aaac.zip | |
x11vnc: add UltraVNC repeater proxy support. fix to setp gui
mode. -threads is now strongly discouraged. Read PORT= in url.
User can set nolisten for Xvfb in -create mode. clean up
wait_for_client() to some degree.
Diffstat (limited to 'x11vnc/tkx11vnc.h')
| -rw-r--r-- | x11vnc/tkx11vnc.h | 46 |
1 files changed, 32 insertions, 14 deletions
diff --git a/x11vnc/tkx11vnc.h b/x11vnc/tkx11vnc.h index 2c76c02..052fe56 100644 --- a/x11vnc/tkx11vnc.h +++ b/x11vnc/tkx11vnc.h @@ -682,7 +682,7 @@ char gui_code[] = ""; "\n" " Properties - Brings up the Properties dialog to set some basic\n" " parameters. The full tkx11vnc GUI may be accessed\n" -" via the \\\"Advanced ...\\\" button. Press \\\"Help ...\\\"\n" +" via the \\\"Advanced ...\\\" button. Press \\\"Help\\\"\n" " in the Properties dialog for more info.\n" " \n" " Help - Displays this help text.\n" @@ -792,7 +792,7 @@ char gui_code[] = ""; "If you set \\\"ViewOnly Password\\\" to the empty string that just removes\n" "the ViewOnly log in aspect: \\\"Password\\\" is still required to log in.\n" "\n" -" - The \\\"Help ...\\\" button shows this help text.\n" +" - The \\\"Help\\\" button shows this help text.\n" " \n" " - The \\\"Advanced ...\\\" button replaces the Properties dialog with the full\n" " tkx11vnc GUI. All dynamic settings can be modified in the full GUI.\n" @@ -4283,7 +4283,7 @@ char gui_code[] = ""; "\n" " bind $w <KeyPress-Escape> \"destroy $w\"\n" "\n" -" pack $b1.apply $b1.cancel $b1.ok -side right -expand 1\n" +" pack $b1.ok $b1.cancel $b1.apply -side left -expand 0\n" " lappend props_buttons $b1.apply $b1.cancel $b1.ok\n" "\n" " set b2 \"$w.buttons2\"\n" @@ -4293,12 +4293,12 @@ char gui_code[] = ""; " -command \"destroy $w; props_advanced\" -font $bfont\n" " if {! $icon_noadvanced} {\n" " lappend props_buttons $b2.advanced\n" -" pack $b2.advanced -side right -expand 1\n" +" pack $b2.advanced -side left -expand 0\n" " }\n" "\n" -" button $b2.help -text \"Help ...\" -command \"menu_help Properties\" -font $bfont\n" +" button $b2.help -text \"Help\" -command \"menu_help Properties\" -font $bfont\n" " lappend props_buttons $b2.help\n" -" pack $b2.help -side right -expand 1\n" +" pack $b2.help -side left -expand 0\n" "\n" " set vp \"$w.viewpw\"\n" " if {$have_labelframes} {\n" @@ -6637,14 +6637,8 @@ char gui_code[] = ""; "\n" "dtime D\n" "\n" -"if {$icon_mode} {\n" -" if {$tray_embed} {\n" -" make_gui \"tray\"\n" -" } else {\n" -" make_gui \"icon\"\n" -" }\n" -" dtime G\n" -" old_balloon\n" +"proc check_setpasswd {} {\n" +" global icon_setpasswd\n" " if {$icon_setpasswd} {\n" " set m \"You must specify a Session Password\\n\" \n" " set m \"${m}before VNC clients can connect.\\n\" \n" @@ -6654,9 +6648,33 @@ char gui_code[] = ""; " do_props $m\n" " #push_new_value \"unlock\" \"unlock\" 1 0\n" " }\n" +"}\n" +"\n" +"if {0} {\n" +" if {[info exists env(X11VNC_ICON_SETPASS)]} {\n" +" if {$env(X11VNC_ICON_SETPASS) == \"2\"} {\n" +" global icon_mode_at_startup icon_mode\n" +" set icon_mode_at_startup 1\n" +" set icon_mode 2\n" +" }\n" +" }\n" +"}\n" +"\n" +"if {$icon_mode} {\n" +" if {$icon_mode == 2} {\n" +" make_gui \"full\"\n" +" } elseif {$tray_embed} {\n" +" make_gui \"tray\"\n" +" } else {\n" +" make_gui \"icon\"\n" +" }\n" +" dtime G\n" +" old_balloon\n" +" check_setpasswd\n" "} else {\n" " make_gui \"full\"\n" " dtime G\n" +" check_setpasswd\n" "}\n" "\n" "\n" |