diff options
| author | runge <runge@karlrunge.com> | 2009-12-28 11:21:50 -0500 |
|---|---|---|
| committer | runge <runge@karlrunge.com> | 2009-12-28 11:21:50 -0500 |
| commit | 5764cd3fdd669096a84c7e40a2893cd45df090e4 (patch) | |
| tree | e82be24266b1691941182f0bedecf41cac83cfb4 /x11vnc/tkx11vnc.h | |
| parent | 018f152bc5c99503d1f59b073046b2f5dca9b042 (diff) | |
| download | libtdevnc-5764cd3fdd669096a84c7e40a2893cd45df090e4.tar.gz libtdevnc-5764cd3fdd669096a84c7e40a2893cd45df090e4.zip | |
x11vnc: Fix problems in --without-x builds. Fix crash
with -QD query for dbus info. Adjust window size for
small screens in -gui. Improve F1 help for xdm, etc.
include ssvnc 1.0.25 source.
Diffstat (limited to 'x11vnc/tkx11vnc.h')
| -rw-r--r-- | x11vnc/tkx11vnc.h | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/x11vnc/tkx11vnc.h b/x11vnc/tkx11vnc.h index beea1bb..432920d 100644 --- a/x11vnc/tkx11vnc.h +++ b/x11vnc/tkx11vnc.h @@ -2543,7 +2543,7 @@ char gui_code[] = ""; "}\n" "\n" "proc get_default_vars {} {\n" -" global default_var\n" +" global default_var env\n" "\n" " set qry [all_query_vars]\n" "\n" @@ -2561,6 +2561,11 @@ char gui_code[] = ""; " if {$i > 50} {\n" " set qargs [list \"-QD\" $q]\n" " set a [run_remote_cmd $qargs]\n" +" if [info exists env(TKX11VNC_PRINT_ALL_QD)] {\n" +" puts $q\n" +" puts $a\n" +" puts \"---------------\"\n" +" }\n" " if {$all != \"\"} {\n" " append all \",\"\n" " }\n" @@ -2572,6 +2577,11 @@ char gui_code[] = ""; " if {$q != \"\"} {\n" " set qargs [list \"-QD\" $q]\n" " set a [run_remote_cmd $qargs]\n" +" if [info exists env(TKX11VNC_PRINT_ALL_QD)] {\n" +" puts $q\n" +" puts $a\n" +" puts \"---------------\"\n" +" }\n" " if {$all != \"\"} {\n" " append all \",\"\n" " }\n" @@ -5993,6 +6003,8 @@ char gui_code[] = ""; " set qst $hmm\n" " } elseif {$item == \"nevershared\"} {\n" " set qst $hmm\n" +" } elseif {$item == \"gui\"} {\n" +" set qst $hmm\n" " }\n" "\n" " if {![info exists menu_var($item)]} {\n" @@ -6967,15 +6979,19 @@ char gui_code[] = ""; "\n" "set screen_height [winfo screenheight .]\n" "set screen_width [winfo screenwidth .]\n" -"if {$screen_height < 500} {\n" -" # short screen, PDA?\n" -" set max_text_height 22\n" -" set text_height 13\n" -" if {$screen_height <= 360} {\n" -" # very short.\n" -" set max_text_height 16\n" -" set max_text_width 60\n" -" set text_height 11\n" +"if {$screen_height < 700} {\n" +" # short screen, netbook?\n" +" set max_text_height 30\n" +" if {$screen_height < 500} {\n" +" # short screen, PDA?\n" +" set max_text_height 22\n" +" set text_height 13\n" +" if {$screen_height <= 360} {\n" +" # very short.\n" +" set max_text_height 16\n" +" set max_text_width 60\n" +" set text_height 11\n" +" }\n" " }\n" "}\n" "if {[info exists env(X11VNC_GUI_TEXT_HEIGHT)]} {\n" |