diff options
| author | runge <runge> | 2008-09-07 04:17:33 +0000 |
|---|---|---|
| committer | runge <runge> | 2008-09-07 04:17:33 +0000 |
| commit | d5cba7a574a667f5321194cb05d0b4adcb995866 (patch) | |
| tree | 2748fd38612cc63256ee864284cd8dab19f4eba1 /x11vnc/tkx11vnc.h | |
| parent | dbfa4ad1f78f6133bc5f50e766f7f3bfdb8fa049 (diff) | |
| download | libtdevnc-d5cba7a574a667f5321194cb05d0b4adcb995866.tar.gz libtdevnc-d5cba7a574a667f5321194cb05d0b4adcb995866.zip | |
x11vnc: kill gui_pid on exit in -connect/-connect_or_exit mode.
-grablocal n experiment (not compiled by default). -macuskbd
option for macosx for orig uskdb code. keycode=N remote contol
cmd. Find dpy look at non-NFS cookies in /tmp. Fix gui tray
insertion on recent gnome dt. Fix connect_file bug. Sync SSVNC
Diffstat (limited to 'x11vnc/tkx11vnc.h')
| -rw-r--r-- | x11vnc/tkx11vnc.h | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/x11vnc/tkx11vnc.h b/x11vnc/tkx11vnc.h index 052fe56..7641f9f 100644 --- a/x11vnc/tkx11vnc.h +++ b/x11vnc/tkx11vnc.h @@ -351,6 +351,7 @@ char gui_code[] = ""; " grabkbd\n" " grabptr\n" " grabalways\n" +" grablocal:\n" " forcedpms\n" " clientdpms\n" " noserverdpms\n" @@ -4839,7 +4840,10 @@ char gui_code[] = ""; " if {$icon_minimal} {\n" " set lab [get_vnc_display_number]\n" " if {$lab != \"none\"} {\n" -" set lab \" :$lab\"\n" +" #set lab \" :$lab\"\n" +" set lab \":$lab\"\n" +" } else {\n" +" set lab \"-\"\n" " }\n" " } else {\n" " set lab $lab0\n" @@ -5085,7 +5089,7 @@ char gui_code[] = ""; " wm title . \"tkx11vnc\"\n" " update\n" " if {$tray_embed && $tray_running} {\n" -" wm deiconify .\n" +" #wm deiconify .; # why did we have this???\n" " #after 10000 {wm deiconify .; puts \"reqheight [winfo reqheight .]\"; puts \"reqwidth [winfo reqwidth .]\"; puts \"height [winfo height .]\"; puts \"width [winfo width .]\"}\n" " } else {\n" " wm deiconify .\n" @@ -5157,7 +5161,7 @@ char gui_code[] = ""; "}\n" "\n" "proc make_gui {mode} {\n" -" global icon_mode tray_embed full_win icon_win\n" +" global icon_mode tray_embed tray_running full_win icon_win\n" " global top_widget_names x11vnc_gui_geom\n" " global gui_current_state make_gui_count\n" " global x11vnc_connect connected_to_x11vnc\n" @@ -5237,7 +5241,9 @@ char gui_code[] = ""; "\n" "\n" " update\n" -" wm deiconify .\n" +" if {!$tray_embed || !$tray_running} {\n" +" wm deiconify .\n" +" }\n" " update idletasks\n" " wm minsize $w [winfo width $w] [winfo height $w]\n" " if {$mode == \"full\" && $make_gui_count > 1} {\n" @@ -6198,6 +6204,9 @@ char gui_code[] = ""; " exit\n" " }\n" " make_gui $new\n" +" if {$new == \"tray\"} {\n" +" wm withdraw .\n" +" }\n" " } else {\n" " set_view_variable $old\n" " }\n" @@ -6357,10 +6366,16 @@ char gui_code[] = ""; "catch {set ls [font metrics $bfont -linespace]}\n" "if {$ls != \"\"} {\n" " if {$ls > 14} {\n" -" # some recent setups have BIG rendering for the above fonts:\n" +" # some recent setups have BIG rendering for the above fonts.\n" +" # on recent (8/08) debian these are really ragged:\n" " set bfont \"-adobe-helvetica-bold-r-*-*-*-90-*-*-*-*-*-*\"\n" " set sfont \"-adobe-helvetica-bold-r-*-*-*-75-*-*-*-*-*-*\"\n" " set snfont \"-adobe-helvetica-medium-r-*-*-*-75-*-*-*-*-*-*\"\n" +"\n" +" # these are bigger but look better... but for how long?\n" +" set bfont \"-adobe-helvetica-bold-r-*-*-*-100-*-*-*-*-*-*\"\n" +" set sfont \"-adobe-helvetica-bold-r-*-*-*-80-*-*-*-*-*-*\"\n" +" set snfont \"-adobe-helvetica-medium-r-*-*-*-80-*-*-*-*-*-*\"\n" " }\n" "}\n" "set help_indent 24;\n" |