Huge number of changes, see x11vnc/ChangeLog

1 files changed, 58 insertions, 20 deletions

diff --git a/x11vnc/tkx11vnc.h b/x11vnc/tkx11vnc.h
index 49b25a3..8180fe2 100644
--- a/x11vnc/tkx11vnc.h
+++ b/x11vnc/tkx11vnc.h
@@ -424,6 +424,7 @@ char gui_code[] = "";
 "	gaps:\n"
 "	grow:\n"
 "	fuzz:\n"
+"	extra_fbur:\n"
 "	wait_ui:\n"
 "	setdefer:\n"
 "	nowait_bog\n"
@@ -760,7 +761,8 @@ char gui_code[] = "";
 "                      non-standard listening port use \\\"host:port\\\".\n"
 "\n"
 "                      Pressing \\\"OK\\\" will initiate the reverse\n"
-"                      connection.  Use a blank hostname to skip it.\n"
+"                      connection.  Use a blank hostname to skip it, or\n"
+"                      delete (\\\"X-out\\\") the window.\n"
 "    \n"
 "\"\n"
 "\n"
@@ -2996,7 +2998,12 @@ char gui_code[] = "";
 "	}\n"
 "	set cache_all_query_vars $qry\n"
 "\n"
-"#puts $qry\n"
+"	global env\n"
+"	if [info exists env(TKX11VNC_PRINT_ALL_VARS)] {\n"
+"		puts \"--------------- BEGIN ALL VARS ---------------\"\n"
+"		puts $qry\n"
+"		puts \"--------------- END ALL VARS ---------------\"\n"
+"	}\n"
 "\n"
 "	return $qry\n"
 "}\n"
@@ -6272,11 +6279,11 @@ char gui_code[] = "";
 "		}\n"
 "\n"
 "		if {$db} {puts stderr \"run_remote_cmd_via_sock: $docmd \\\"$str\\\"\"}\n"
-"		puts $client_sock $str\n"
+"		catch {puts $client_sock $str}\n"
 "		if {$db} {puts stderr \"run_remote_cmd_via_sock: flush\"}\n"
-"		flush $client_sock\n"
+"		catch {flush $client_sock}\n"
 "		if {$db} {puts stderr \"run_remote_cmd_via_sock: gets\"}\n"
-"		gets $client_sock res\n"
+"		catch {gets $client_sock res}\n"
 "		if {$db} {puts stderr \"run_remote_cmd_via_sock: \\\"$res\\\"\"}\n"
 "		set res [string trim $res]\n"
 "\n"
@@ -6546,18 +6553,18 @@ char gui_code[] = "";
 "	} else {\n"
 "		frame .pp.f -bd 1 -relief ridge -pady 2\n"
 "	}\n"
-"	label .pp.f.l -text \"Port: \"\n"
-"	entry .pp.f.e -width 8 -textvariable port_set\n"
+"	label .pp.f.l -text \"Port: \" -font $bfont\n"
+"	entry .pp.f.e -width 8 -textvariable port_set -font $ffont\n"
 "	global enable_ssl; set enable_ssl 0\n"
 "	if [info exists env(X11VNC_SSL_ENABLED)] {\n"
 "		set enable_ssl 1\n"
 "	}\n"
-"	checkbutton .pp.f.ssl -relief raised -pady 3 -padx 3 -text \"Enable SSL\" -variable enable_ssl\n"
+"	checkbutton .pp.f.ssl -relief raised -pady 3 -padx 3 -text \"Enable SSL\" -variable enable_ssl -font $bfont\n"
 "	global localhost; set localhost 0\n"
 "	if [info exists env(X11VNC_LOCALHOST_ENABLED)] {\n"
 "		set localhost 1\n"
 "	}\n"
-"	checkbutton .pp.f.loc -relief raised -pady 3 -padx 3 -text \"Listen on localhost\" -variable localhost\n"
+"	checkbutton .pp.f.loc -relief raised -pady 3 -padx 3 -text \"Listen on localhost\" -variable localhost -font $bfont\n"
 "	pack .pp.f.l .pp.f.e -side left\n"
 "	pack .pp.f.loc .pp.f.ssl -side right\n"
 "\n"
@@ -6570,15 +6577,15 @@ char gui_code[] = "";
 "	if [info exists env(X11VNC_FILETRANSFER_ENABLED)] {\n"
 "		set file_transfer $env(X11VNC_FILETRANSFER_ENABLED)\n"
 "	}\n"
-"	label .pp.t.l -text \"File Transfer: \"\n"
-"	radiobutton .pp.t.none  -text \"None\" -variable file_transfer -value \"none\"\n"
-"	radiobutton .pp.t.ultra -text \"UltraVNC\" -variable file_transfer -value \"ultra\"\n"
-"	radiobutton .pp.t.tight -text \"TightVNC\" -variable file_transfer -value \"tight\"\n"
+"	label .pp.t.l -text \"File Transfer: \" -font $bfont\n"
+"	radiobutton .pp.t.none  -text \"None\" -variable file_transfer -value \"none\" -font $bfont\n"
+"	radiobutton .pp.t.ultra -text \"UltraVNC\" -variable file_transfer -value \"ultra\" -font $bfont\n"
+"	radiobutton .pp.t.tight -text \"TightVNC\" -variable file_transfer -value \"tight\" -font $bfont\n"
 "	pack .pp.t.l .pp.t.none .pp.t.ultra .pp.t.tight -side left\n"
 "\n"
 "	frame .pp.o -bd 1 -relief ridge\n"
-"	button .pp.o.ok -text \"OK\" -command \"set port_reply 1; destroy .pp\"\n"
-"	button .pp.o.cancel -text \"Cancel\" -command \"set port_reply 0; destroy .pp\"\n"
+"	button .pp.o.ok -text \"OK\" -command \"set port_reply 1; destroy .pp\" -font $bfont\n"
+"	button .pp.o.cancel -text \"Cancel\" -command \"set port_reply 0; destroy .pp\" -font $bfont\n"
 "	pack .pp.o.ok .pp.o.cancel -side left -fill x -expand 1\n"
 "	pack .pp.m -side top -fill x -expand 1 \n"
 "	pack .pp.f .pp.t .pp.o -side top -fill x\n"
@@ -6805,6 +6812,24 @@ char gui_code[] = "";
 "set snfont \"-adobe-helvetica-medium-r-*-*-*-100-*-*-*-*-*-*\"\n"
 "set ffont \"fixed\"\n"
 "\n"
+"set got_helv 0\n"
+"catch {\n"
+"	foreach fam [font families]  {\n"
+"		if {$fam == \"helvetica\"} {\n"
+"			set got_helv 1\n"
+"		}\n"
+"		if {$fam == \"Helvetica\"} {\n"
+"			set got_helv 1\n"
+"		}\n"
+"	}\n"
+"}\n"
+"\n"
+"if {$got_helv} {\n"
+"	set bfont  \"Helvetica -12 bold\"\n"
+"	set sfont  \"Helvetica -10 bold\"\n"
+"	set snfont \"Helvetica -10\"\n"
+"}\n"
+"\n"
 "set ls \"\"\n"
 "catch {set ls [font metrics $bfont -linespace]}\n"
 "if {$ls != \"\" && $ls > 14} {\n"
@@ -6925,11 +6950,6 @@ char gui_code[] = "";
 "	puts \";\"\n"
 "	exit 0\n"
 "}\n"
-"if {\"$argv\" == \"-portprompt\"} {\n"
-"	do_port_prompt\n"
-"	exit 0\n"
-"}\n"
-"\n"
 "\n"
 "set_view_variable \"full\"\n"
 "\n"
@@ -6988,6 +7008,19 @@ char gui_code[] = "";
 "	set x11vnc_gui_params \"\"\n"
 "}\n"
 "\n"
+"if {[info exists env(X11VNC_FONT_BOLD)]} {\n"
+"	set bfont $env(X11VNC_FONT_BOLD)\n"
+"}\n"
+"if {[info exists env(X11VNC_FONT_BOLD_SMALL)]} {\n"
+"	set sfont $env(X11VNC_FONT_BOLD_SMALL)\n"
+"}\n"
+"if {[info exists env(X11VNC_FONT_REG_SMALL)]} {\n"
+"	set snfont $env(X11VNC_FONT_REG_SMALL)\n"
+"}\n"
+"if {[info exists env(X11VNC_FONT_FIXED)]} {\n"
+"	set ffont $env(X11VNC_FONT_FIXED)\n"
+"}\n"
+"\n"
 "if {[info exists env(X11VNC_CONNECT_FILE)]} {\n"
 "	set x11vnc_connect_file $env(X11VNC_CONNECT_FILE);\n"
 "} else {\n"
@@ -7097,6 +7130,11 @@ char gui_code[] = "";
 "	set bfont {system}\n"
 "}\n"
 "\n"
+"if {\"$argv\" == \"-portprompt\"} {\n"
+"	do_port_prompt\n"
+"	exit 0\n"
+"}\n"
+"\n"
 "#puts [exec env]\n"
 "#puts \"x11vnc_xdisplay: $x11vnc_xdisplay\"\n"
 "\n"