x11vnc: -debug_ncache, fix big fonts in tkx11vnc.

x11vnc/ChangeLog

+2007-07-04  Karl Runge <runge@karlrunge.com>
+	* x11vnc: -debug_ncache, fix big fonts in tkx11vnc.
+
 2007-06-14  Karl Runge <runge@karlrunge.com>
 	* x11vnc: add detectors if ultravnc chat or file xfer took place,
 	  if so ping clients more frequently.  Fix compile bug if libssl

x11vnc/help.c

@@ -2331,6 +2331,7 @@ void print_help(int mode) {
 "                       (e.g. MacOS X window manager), although it could make\n"
 "                       things worse.  The default is 0 on Unix and 24 on\n"
 "                       MacOS X.\n"
+"-debug_ncache          Turn on debugging and profiling output under -ncache.\n"
 "\n"
 #endif
 "-wireframe [str]       Try to detect window moves or resizes when a mouse\n"
@@ -3792,6 +3793,8 @@ void print_help(int mode) {
 "                       nodebug_grabs   disable -debug_grabs\n"
 "                       debug_sel       enable  -debug_sel\n"
 "                       nodebug_sel     disable -debug_sel\n"
+"                       debug_ncache    enable  -debug_ncache\n"
+"                       nodebug_ncache  disable -debug_ncache\n"
 "                       dbg             enable  -dbg crash shell\n"
 "                       nodbg           disable -dbg crash shell\n"
 "\n"
@@ -3845,24 +3848,25 @@ void print_help(int mode) {
 "                       nomodtweak xkb noxkb capslock nocapslock skip_lockkeys\n"
 "                       noskip_lockkeys skip_keycodes sloppy_keys nosloppy_keys\n"
 "                       skip_dups noskip_dups add_keysyms noadd_keysyms\n"
-"                       clear_mods noclear_mods clear_keys noclear_keys remap\n"
-"                       repeat norepeat fb nofb bell nobell sel nosel primary\n"
-"                       noprimary setprimary nosetprimary clipboard noclipboard\n"
-"                       setclipboard nosetclipboard seldir cursorshape\n"
-"                       nocursorshape cursorpos nocursorpos cursor_drag\n"
-"                       nocursor_drag cursor show_cursor noshow_cursor nocursor\n"
-"                       arrow xfixes noxfixes xdamage noxdamage xd_area xd_mem\n"
-"                       alphacut alphafrac alpharemove noalpharemove alphablend\n"
-"                       noalphablend xwarppointer xwarp noxwarppointer\n"
-"                       noxwarp buttonmap dragging nodragging ncache_cr\n"
-"                       noncache_cr ncache_no_moveraise noncache_no_moveraise\n"
-"                       ncache_no_dtchange noncache_no_dtchange\n"
-"                       ncache_no_rootpixmap noncache_no_rootpixmap\n"
-"                       ncache_reset_rootpixmap ncache_keep_anims\n"
-"                       noncache_keep_anims ncache_old_wm noncache_old_wm\n"
-"                       ncache noncache ncache_size wireframe_mode wireframe wf\n"
-"                       nowireframe nowf wireframelocal wfl nowireframelocal\n"
-"                       nowfl wirecopyrect wcr nowirecopyrect nowcr scr_area\n"
+"                       clear_mods noclear_mods clear_keys noclear_keys\n"
+"                       remap repeat norepeat fb nofb bell nobell sel nosel\n"
+"                       primary noprimary setprimary nosetprimary clipboard\n"
+"                       noclipboard setclipboard nosetclipboard seldir\n"
+"                       cursorshape nocursorshape cursorpos nocursorpos\n"
+"                       cursor_drag nocursor_drag cursor show_cursor\n"
+"                       noshow_cursor nocursor arrow xfixes noxfixes xdamage\n"
+"                       noxdamage xd_area xd_mem alphacut alphafrac alpharemove\n"
+"                       noalpharemove alphablend noalphablend xwarppointer\n"
+"                       xwarp noxwarppointer noxwarp buttonmap dragging\n"
+"                       nodragging ncache_cr noncache_cr ncache_no_moveraise\n"
+"                       noncache_no_moveraise ncache_no_dtchange\n"
+"                       noncache_no_dtchange ncache_no_rootpixmap\n"
+"                       noncache_no_rootpixmap ncache_reset_rootpixmap\n"
+"                       ncache_keep_anims noncache_keep_anims ncache_old_wm\n"
+"                       noncache_old_wm ncache noncache ncache_size debug_ncache\n"
+"                       nodebug_ncache wireframe_mode wireframe wf nowireframe\n"
+"                       nowf wireframelocal wfl nowireframelocal nowfl\n"
+"                       wirecopyrect wcr nowirecopyrect nowcr scr_area\n"
 "                       scr_skip scr_inc scr_keys scr_term scr_keyrepeat\n"
 "                       scr_parms scrollcopyrect scr noscrollcopyrect\n"
 "                       noscr fixscreen noxrecord xrecord reset_record\n"

x11vnc/options.c

@@ -206,8 +206,8 @@ int wireframe_local = 1;
 #ifdef NO_NCACHE
 #define NCACHE 0 
 #else
-#define xxNCACHE -12
-#define NCACHE -1
+#define NCACHE -12
+#define xxNCACHE -1
 #endif
 #endif
 
@@ -232,6 +232,7 @@ int ncache_keep_anims = 0;
 int ncache_old_wm = 0;
 int macosx_ncache_macmenu = 0;
 int ncache_beta_tester = 0;
+int ncdb = 0;
 
 Atom atom_NET_ACTIVE_WINDOW = None;
 Atom atom_NET_CURRENT_DESKTOP = None;

x11vnc/options.h

@@ -173,6 +173,7 @@ extern int ncache_keep_anims;
 extern int ncache_old_wm;
 extern int macosx_ncache_macmenu;
 extern int ncache_beta_tester;
+extern int ncdb;
 
 extern Atom atom_NET_ACTIVE_WINDOW;
 extern Atom atom_NET_CURRENT_DESKTOP;

x11vnc/remote.c

@@ -2940,6 +2940,20 @@ char *process_remote_cmd(char *cmd, int stringonly) {
 				check_ncache(1,0);
 			}
 		}
+	} else if (!strcmp(p, "debug_ncache")) {
+		if (query) {
+			snprintf(buf, bufn, "ans=%s:%d", p, ncdb);
+			goto qry;
+		}
+		ncdb = 1;
+		rfbLog("remote_cmd: enabled debug_ncache\n");
+	} else if (!strcmp(p, "nodebug_ncache")) {
+		if (query) {
+			snprintf(buf, bufn, "ans=%s:%d", p, !ncdb);
+			goto qry;
+		}
+		ncdb = 0;
+		rfbLog("remote_cmd: disabled debug_ncache\n");
 #endif
 
 	} else if (strstr(p, "wireframe_mode") == p) {

x11vnc/scan.c

@@ -2931,7 +2931,7 @@ if (ncache > 0) {
 				nomsg = 0;
 			}
 		} else {
-fprintf(stderr, "\n*** SCAN_DISPLAY CHECK_NCACHE/%d *** %d rescan=%d\n", gotone, y, rescan);
+if (ncdb) fprintf(stderr, "\n*** SCAN_DISPLAY CHECK_NCACHE/%d *** %d rescan=%d\n", gotone, y, rescan);
 		}
 		X_UNLOCK;
 		check_ncache(0, 1);

x11vnc/tkx11vnc

@@ -286,6 +286,7 @@ Debugging
 	debug_tiles
 	debug_grabs
 	debug_sel
+	debug_ncache
 	dbg
 	=GAL LOFF
 
@@ -383,7 +384,7 @@ Tuning
 	ncache_no_dtchange
 	ncache_no_rootpixmap
 	ncache_keep_anims
-	=A ncache_reset_rootpixmap
+	=RA ncache_reset_rootpixmap
 	=GAL LOFF
 	--
 	=GAL SharedMemory::
@@ -6321,6 +6322,17 @@ set bfont "-adobe-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*"
 set sfont "-adobe-helvetica-bold-r-*-*-*-100-*-*-*-*-*-*"
 set snfont "-adobe-helvetica-medium-r-*-*-*-100-*-*-*-*-*-*"
 set ffont "fixed"
+
+set ls ""
+catch {set ls [font metrics $bfont -linespace]}
+if {$ls != ""} {
+    if {$ls > 14} {
+	# some recent setups have BIG rendering for the above fonts:
+	set bfont "-adobe-helvetica-bold-r-*-*-*-90-*-*-*-*-*-*"
+	set sfont "-adobe-helvetica-bold-r-*-*-*-75-*-*-*-*-*-*"
+	set snfont "-adobe-helvetica-medium-r-*-*-*-75-*-*-*-*-*-*"
+    }
+}
 set help_indent 24;
 set reply_xdisplay ""
 set all_settings "None so far."

x11vnc/tkx11vnc.h

@@ -297,6 +297,7 @@ char gui_code[] = "";
 "	debug_tiles\n"
 "	debug_grabs\n"
 "	debug_sel\n"
+"	debug_ncache\n"
 "	dbg\n"
 "	=GAL LOFF\n"
 "\n"
@@ -394,7 +395,7 @@ char gui_code[] = "";
 "	ncache_no_dtchange\n"
 "	ncache_no_rootpixmap\n"
 "	ncache_keep_anims\n"
-"	=A ncache_reset_rootpixmap\n"
+"	=RA ncache_reset_rootpixmap\n"
 "	=GAL LOFF\n"
 "	--\n"
 "	=GAL SharedMemory::\n"
@@ -6332,6 +6333,17 @@ char gui_code[] = "";
 "set sfont \"-adobe-helvetica-bold-r-*-*-*-100-*-*-*-*-*-*\"\n"
 "set snfont \"-adobe-helvetica-medium-r-*-*-*-100-*-*-*-*-*-*\"\n"
 "set ffont \"fixed\"\n"
+"\n"
+"set ls \"\"\n"
+"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"
+"	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"
+"}\n"
 "set help_indent 24;\n"
 "set reply_xdisplay \"\"\n"
 "set all_settings \"None so far.\"\n"

x11vnc/x11vnc.1

 .\" This file was automatically generated from x11vnc -help output.
-.TH X11VNC "1" "June 2007" "x11vnc " "User Commands"
+.TH X11VNC "1" "July 2007" "x11vnc " "User Commands"
 .SH NAME
 x11vnc - allow VNC connections to real X11 displays
-         version: 0.9.2, lastmod: 2007-06-16
+         version: 0.9.3, lastmod: 2007-07-03
 .SH SYNOPSIS
 .B x11vnc
 [OPTION]...
@@ -2731,6 +2731,10 @@ the situation with dropshadows or other compositing
 things worse.  The default is 0 on Unix and 24 on
 MacOS X.
 .PP
+\fB-debug_ncache\fR
+.IP
+Turn on debugging and profiling output under \fB-ncache.\fR
+.PP
 \fB-wireframe\fR \fI[str],\fR \fB-nowireframe\fR
 .IP
 Try to detect window moves or resizes when a mouse
@@ -4627,6 +4631,10 @@ debug_sel       enable  \fB-debug_sel\fR
 .IP
 nodebug_sel     disable \fB-debug_sel\fR
 .IP
+debug_ncache    enable  \fB-debug_ncache\fR
+.IP
+nodebug_ncache  disable \fB-debug_ncache\fR
+.IP
 dbg             enable  \fB-dbg\fR crash shell
 .IP
 nodbg           disable \fB-dbg\fR crash shell
@@ -4700,24 +4708,25 @@ xrandr_mode rotate padgeom quiet q noquiet modtweak
 nomodtweak xkb noxkb capslock nocapslock skip_lockkeys
 noskip_lockkeys skip_keycodes sloppy_keys nosloppy_keys
 skip_dups noskip_dups add_keysyms noadd_keysyms
-clear_mods noclear_mods clear_keys noclear_keys remap
-repeat norepeat fb nofb bell nobell sel nosel primary
-noprimary setprimary nosetprimary clipboard noclipboard
-setclipboard nosetclipboard seldir cursorshape
-nocursorshape cursorpos nocursorpos cursor_drag
-nocursor_drag cursor show_cursor noshow_cursor nocursor
-arrow xfixes noxfixes xdamage noxdamage xd_area xd_mem
-alphacut alphafrac alpharemove noalpharemove alphablend
-noalphablend xwarppointer xwarp noxwarppointer
-noxwarp buttonmap dragging nodragging ncache_cr
-noncache_cr ncache_no_moveraise noncache_no_moveraise
-ncache_no_dtchange noncache_no_dtchange
-ncache_no_rootpixmap noncache_no_rootpixmap
-ncache_reset_rootpixmap ncache_keep_anims
-noncache_keep_anims ncache_old_wm noncache_old_wm
-ncache noncache ncache_size wireframe_mode wireframe wf
-nowireframe nowf wireframelocal wfl nowireframelocal
-nowfl wirecopyrect wcr nowirecopyrect nowcr scr_area
+clear_mods noclear_mods clear_keys noclear_keys
+remap repeat norepeat fb nofb bell nobell sel nosel
+primary noprimary setprimary nosetprimary clipboard
+noclipboard setclipboard nosetclipboard seldir
+cursorshape nocursorshape cursorpos nocursorpos
+cursor_drag nocursor_drag cursor show_cursor
+noshow_cursor nocursor arrow xfixes noxfixes xdamage
+noxdamage xd_area xd_mem alphacut alphafrac alpharemove
+noalpharemove alphablend noalphablend xwarppointer
+xwarp noxwarppointer noxwarp buttonmap dragging
+nodragging ncache_cr noncache_cr ncache_no_moveraise
+noncache_no_moveraise ncache_no_dtchange
+noncache_no_dtchange ncache_no_rootpixmap
+noncache_no_rootpixmap ncache_reset_rootpixmap
+ncache_keep_anims noncache_keep_anims ncache_old_wm
+noncache_old_wm ncache noncache ncache_size debug_ncache
+nodebug_ncache wireframe_mode wireframe wf nowireframe
+nowf wireframelocal wfl nowireframelocal nowfl
+wirecopyrect wcr nowirecopyrect nowcr scr_area
 scr_skip scr_inc scr_keys scr_term scr_keyrepeat
 scr_parms scrollcopyrect scr noscrollcopyrect
 noscr fixscreen noxrecord xrecord reset_record

x11vnc/x11vnc.c

@@ -2307,6 +2307,8 @@ int main(int argc, char* argv[]) {
 		} else if (!strcmp(arg, "-ncache_pad") || !strcmp(arg, "-nc_pad")) {
 			CHECK_ARGC
 			ncache_pad = atoi(argv[++i]);
+		} else if (!strcmp(arg, "-debug_ncache")) {
+			ncdb++;
 #endif
 		} else if (!strcmp(arg, "-wireframe")
 		    || !strcmp(arg, "-wf")) {
@@ -3670,6 +3672,9 @@ int main(int argc, char* argv[]) {
 			rfbLog("  Note: '-scale' is on and this can cause more problems.\n");
 		}
 	}
+	if (ncache && getenv("NCACHE_DEBUG")) {
+		ncdb = 1;
+	}
 
 	/* check for OS with small shm limits */
 	if (using_shm && ! single_copytile) {

x11vnc/x11vnc_defs.c

@@ -15,7 +15,7 @@ int xtrap_base_event_type = 0;
 int xdamage_base_event_type = 0;
 
 /*               date +'lastmod: %Y-%m-%d' */
-char lastmod[] = "0.9.2 lastmod: 2007-06-16";
+char lastmod[] = "0.9.3 lastmod: 2007-07-03";
 
 /* X display info */