x11vnc: -8to24 speedups and improvements.

x11vnc/8to24.h

@@ -8,6 +8,6 @@ extern int multivis_24count;
 
 extern void check_for_multivis(void);
 extern void bpp8to24(int, int, int, int);
-extern void mark_8bpp(void);
+extern void mark_8bpp(int);
 
 #endif /* _X11VNC_8TO24_H */

x11vnc/ChangeLog

+2006-02-04  Karl Runge <runge@karlrunge.com>
+	* x11vnc: -8to24 speedups and improvements.
+
 2006-01-21  Karl Runge <runge@karlrunge.com>
 	* x11vnc: -8to24 opts, use XGetSubImage. fix -threads deadlocks and
 	  -rawfb crash.

x11vnc/options.c

@@ -24,7 +24,7 @@ char *solid_default = "cyan4";
 
 char *wmdt_str = NULL;		/* -wmdt */
 
-char *speeds_str = NULL;	/* -speeds TBD */
+char *speeds_str = NULL;	/* -speeds */
 
 char *rc_rcfile = NULL;		/* -rc */
 int rc_rcfile_default = 0;
@@ -208,6 +208,7 @@ char* screen_fixup_str = NULL;
 double screen_fixup_V = 0.0;
 double screen_fixup_C = 0.0;
 double screen_fixup_X = 0.0;
+double screen_fixup_8 = 0.0;
 
 #ifndef NOREPEAT
 #define NOREPEAT 1

x11vnc/options.h

@@ -154,6 +154,7 @@ extern char* screen_fixup_str;
 extern double screen_fixup_V;
 extern double screen_fixup_C;
 extern double screen_fixup_X;
+extern double screen_fixup_8;
 
 extern int no_autorepeat;
 extern int no_repeat_countdown;

x11vnc/params.h

@@ -13,6 +13,10 @@
 #define SCROLL_COPYRECT_PARMS "0+64+32+32,0.02+0.10+0.9,0.03+0.06+0.5+0.1+5.0"
 #endif
 
+#ifndef POLL_8TO24_DELAY
+#define POLL_8TO24_DELAY 0.05
+#endif
+
 #define LATENCY0 20     /* 20ms */
 #define NETRATE0 20     /* 20KB/sec */
 

x11vnc/rates.c

@@ -200,7 +200,7 @@ void initialize_speeds(void) {
 		int n = 0;
 		double dt, timer;
 		dtime0(&timer);
-		if (raw_fb && ! dpy) {		/* raw_fb hack */
+		if (0 && raw_fb && ! dpy) {		/* raw_fb hack */
 			n = 0;
 		} else if (fullscreen) {
 			copy_image(fullscreen, 0, 0, 0, 0);

x11vnc/scan.c

@@ -2379,7 +2379,7 @@ static int scan_display(int ystart, int rescan) {
 }
 
 
-static int scanlines[NSCAN] = {
+int scanlines[NSCAN] = {
 	 0, 16,  8, 24,  4, 20, 12, 28,
 	10, 26, 18,  2, 22,  6, 30, 14,
 	 1, 17,  9, 25,  7, 23, 15, 31,
@@ -2435,7 +2435,7 @@ int scan_for_updates(int count_only) {
 			/* check for changed colormap */
 			set_colormap(0);
 		}
-		if (cmap8to24 && scan_count % 4 == 0) {
+		if (cmap8to24 && scan_count % 1 == 0) {
 			check_for_multivis();
 		}
 		if (use_xdamage) {

x11vnc/scan.h

@@ -4,6 +4,7 @@
 /* -- scan.h -- */
 
 extern int nap_ok;
+extern int scanlines[];
 
 extern void initialize_tiles(void);
 extern void free_tiles(void);

x11vnc/userinput.c

@@ -211,6 +211,7 @@ void parse_fixscreen(void) {
 	screen_fixup_V = 0.0;
 	screen_fixup_C = 0.0;
 	screen_fixup_X = 0.0;
+	screen_fixup_8 = 0.0;
 
 	if (! screen_fixup_str) {
 		return;
@@ -227,6 +228,8 @@ void parse_fixscreen(void) {
 			screen_fixup_C = t;
 		} else if (*p == 'X' && sscanf(p, "X=%lf", &t) == 1) {
 			screen_fixup_X = t;
+		} else if (*p == 'X' && sscanf(p, "8=%lf", &t) == 1) {
+			screen_fixup_8 = t;
 		}
 		p = strtok(NULL, ",");
 	}
@@ -235,6 +238,7 @@ void parse_fixscreen(void) {
 	if (screen_fixup_V < 0.0) screen_fixup_V = 0.0;
 	if (screen_fixup_C < 0.0) screen_fixup_C = 0.0;
 	if (screen_fixup_X < 0.0) screen_fixup_X = 0.0;
+	if (screen_fixup_8 < 0.0) screen_fixup_8 = 0.0;
 }
 
 /*
@@ -716,11 +720,11 @@ typedef struct saveline {
  */
 static void draw_box(int x, int y, int w, int h, int restore) {
 	int x0, y0, x1, y1, i, pixelsize = bpp/8;
-	char *dst, *src;
+	char *dst, *src, *use_fb;
 	static saveline_t *save[4];
 	static int first = 1, len = 0;
 	int max = dpy_x > dpy_y ? dpy_x : dpy_y;
-	int sz, lw = wireframe_lw;
+	int use_Bpl, lw = wireframe_lw;
 	unsigned long shade = wireframe_shade;
 	int color = 0;
 	unsigned short us = 0;
@@ -730,7 +734,18 @@ static void draw_box(int x, int y, int w, int h, int restore) {
 		x -= coff_x;
 		y -= coff_y;
 	}
-	/* no subwin for wireframe */
+
+	/* handle -8to24 mode: use 2nd fb only */
+	use_fb  = main_fb;
+	use_Bpl = main_bytes_per_line; 
+	
+	if (cmap8to24 && cmap8to24_fb) {
+		use_fb = cmap8to24_fb;
+		pixelsize = 4;
+		if (depth == 8) {
+			use_Bpl *= 4;
+		}
+	}
 
 	if (max > len) {
 		/* create/resize storage lines: */
@@ -745,8 +760,7 @@ static void draw_box(int x, int y, int w, int h, int restore) {
 			}
 			save[i] = (saveline_t *) malloc(sizeof(saveline_t));
 			save[i]->saved = 0;
-			sz = (LW_MAX+1)*len*pixelsize;
-			save[i]->data = (char *) malloc(sz);
+			save[i]->data = (char *) malloc( (LW_MAX+1)*len*4 );
 
 			/* 
 			 * Four types of lines:
@@ -813,8 +827,7 @@ static void draw_box(int x, int y, int w, int h, int restore) {
 				y_max = yu;
 			}
 			src = save[i]->data + (yu-y_start)*y_step;
-			dst = main_fb + yu*main_bytes_per_line +
-			    x0*pixelsize;
+			dst = use_fb + yu*use_Bpl + x0*pixelsize;
 			memcpy(dst, src, (x1-x0)*pixelsize);
 		}
 		if (y_min >= 0) {
@@ -917,8 +930,7 @@ if (0) fprintf(stderr, "  DrawBox: %dx%d+%d+%d\n", w, h, x, y);
 
 			/* save fb data for this line: */
 			save[i]->saved = 1;
-			src = main_fb + yu*main_bytes_per_line +
-			    x0*pixelsize;
+			src = use_fb + yu*use_Bpl + x0*pixelsize;
 			dst = save[i]->data + (yu-y_start)*y_step;
 			memcpy(dst, src, (x1-x0)*pixelsize);
 
@@ -1577,6 +1589,7 @@ if (0) fprintf(stderr, "  try_copyrect dt: %.4f\n", dt);
 			win_area += (tx2 - tx1)*(ty2 - ty1);
 		}
 		sraRgnReleaseIterator(iter);
+
 		sraRgnDestroy(tmpregion);
 
 
@@ -1634,6 +1647,7 @@ if (db) fprintf(stderr, "  DFC(%d,%d-%d,%d)", tx1, ty1, tx2, ty2);
 PUSH_TEST(0);
 			}
 			sraRgnReleaseIterator(iter);
+
 			dt = dtime(&tm);
 if (db) fprintf(stderr, "  dfc---- dt: %.4f", dt);
 
@@ -3726,20 +3740,22 @@ if (db) fprintf(stderr, "send_copyrect: %d\n", sent_copyrect);
 	rfbPE(1000);
 	wireframe_in_progress = 0;
 
+	if (0) {
+	/* No longer needed.  see draw_box() */
 	    if (frame_changed && cmap8to24 && multivis_count) {
-		/* handle -8to24 tweak, mark area and check 8bpp... */
+		/* handle -8to24 kludge, mark area and check 8bpp... */
 		int x1, x2, y1, y2, f = 16;
 		x1 = nmin(box_x, orig_x) - f;
 		y1 = nmin(box_y, orig_y) - f;
 		x2 = nmax(box_x + box_w, orig_x + orig_w) + f;
 		y2 = nmax(box_y + box_h, orig_y + orig_h) + f;
 		x1 = nfix(x1, dpy_x);
-		x2 = nfix(x2, dpy_x);
+		x2 = nfix(x2, dpy_x+1);
 		y1 = nfix(y1, dpy_y);
-		y2 = nfix(y2, dpy_y);
-if (0) fprintf(stderr, "wireframe_in_progress over: %d %d %d %d\n", x1, y1, x2, y2);
+		y2 = nfix(y2, dpy_y+1);
 		check_for_multivis();
-		if (1) mark_rect_as_modified(x1, y1, x2, y2, 0);
+		mark_rect_as_modified(x1, y1, x2, y2, 0);
+	    }
 	}
 
 	urgent_update = 1;

x11vnc/x11vnc.1

 .\" This file was automatically generated from x11vnc -help output.
-.TH X11VNC "1" "January 2006" "x11vnc " "User Commands"
+.TH X11VNC "1" "February 2006" "x11vnc " "User Commands"
 .SH NAME
 x11vnc - allow VNC connections to real X11 displays
-         version: 0.8, lastmod: 2006-01-21
+         version: 0.8, lastmod: 2006-02-04
 .SH SYNOPSIS
 .B x11vnc
 [OPTION]...
@@ -183,55 +183,66 @@ cursor shape using the overlay mechanism.
 Try this option if \fB-overlay\fR is not supported on your
 OS, and you have a legacy 8bpp app that you want to
 view on a multi-depth display with default depth 24
-(and is 32 bpp) or have default depth 8 display with
+(and is 32 bpp) OR have a default depth 8 display with
 depth 24 overlay windows for some apps.  This option
-may not work on all X servers and hardware (tested on
-XFree86/Xorg mga driver).  The "opts" string is not
-required and is described below.
+may not work on all X servers and hardware (tested
+on XFree86/Xorg mga driver and Xsun).  The "opts"
+string is not required and is described below.
 .IP
 This mode enables a hack where x11vnc monitors windows
 within 3 levels from the root window.  If it finds
-any that are 8bpp it will apply a transformation for
-pixel data in these regions where it extracts the 8bpp
-index color value from bits 25-32 and maps them on
-to TrueColor values and inserts them into bits 1-24
-(i.e. overwrites bits 1-24).  Whereas for default
-depth 8 displays, everything is tranformed to 32bpp
-(and is potentially a improvement over \fB-flashcmap).\fR
-.IP
-These schemes appear to work, but may still have
-bugs and note that they do hog resources.  If there
-are multiple 8bpp windows using different colormaps,
-one may have to iconify all but one for the colors to
-be correct.
-.IP
-There may also be painting errors for clipping and
-switching between windows of depths 8 and 24.
-Heuristics are applied to try to minimize the painting
-errors.  One can also press 3 Alt_L's in a row to
-refresh the screen if the error does not repair itself.
-Also the option, say, \fB-fixscreen\fR V=3.0 may be use
-to periodically refresh the screen (at the cost of
-bandwidth).
+any that are 8bpp it extracts the indexed color
+pixel values using XGetImage() and then applies a
+transformation using the colormap(s) to create TrueColor
+RGB values that it in turn inserts into bits 1-24 of
+the framebuffer.  This creates a depth 24 "view"
+of the display that is then exported via VNC.
+.IP
+Conversely, for default depth 8 displays, the depth
+24 regions are read by XGetImage() and everything is
+transformed and inserted into a depth 24 TrueColor
+framebuffer.
+.IP
+Note that even if there are *no* depth 24 visuals or
+windows (i.e. pure 8bpp), this mode is potentially
+a improvement over \fB-flashcmap\fR because it avoids the
+flashing and shows each window in the correct color.
+.IP
+This method appear to work, but may still have bugs
+and it does hog resources.  If there are multiple 8bpp
+windows using different colormaps, one may have to
+iconify all but one for the colors to be correct.
+.IP
+There may be painting errors for clipping and switching
+between windows of depths 8 and 24.  Heuristics are
+applied to try to minimize the painting errors.
+One can also press 3 Alt_L's in a row to refresh the
+screen if the error does not repair itself.  Also the
+option \fB-fixscreen\fR 8=3.0 or \fB-fixscreen\fR V=3.0 may be
+use to periodically refresh the screen at the cost of
+bandwidth (every 3 sec for this example).
 .IP
 The [opts] string can contain the following settings.
 Multiple settings are separated by commas.
 .IP
-For when there are still color problems, enable an even
-more experimental mode via the option "getimage".
-This enables a scheme were XGetImage() is used to
-retrieve the 8bpp data instead of assuming that data
-is in bits 25-32.  This mode is significantly slower
-than the above mode.  For the default depth 8 case,
-XGetImage() is always used to access depth 24 pixel
-data.
-.IP
-For default depth 8 displays, setting option
-"highbits" may give a speedup for transforming 8bpp
-pixel data.
+For for some X servers with default depth 24 a
+speedup may be achieved via the option "nogetimage".
+This enables a scheme were XGetImage() is not used
+to retrieve the 8bpp data.  Instead, it assumes that
+the 8bpp data is in bits 25-32 of the 32bit X pixels.
+There is no reason the X server should put the data
+there for our poll requests, but some do and so the
+extra steps to retrieve it can be skipped.  Tested with
+mga driver with XFree86/Xorg.  For the default depth
+8 case this option is ignored.
+.IP
+To adjust how often XGetImage() is used to poll the
+non-default visual regions for changes, use the option
+"poll=t" where "t" is a floating point time.
+(default: 0.05)
 .IP
 Debugging for this mode can be enabled by setting
-"dbg=1", "dbg=2", or "dbg=3"
+"dbg=1", "dbg=2", or "dbg=3".
 .PP
 \fB-scale\fR \fIfraction\fR
 .IP
@@ -1477,22 +1488,25 @@ it is intended for cases when the \fB-scrollcopyrect\fR or
 but it can be used for any scenario.  This option
 periodically performs costly operations and so
 interactive response may be reduced when it is on.
-You can use 3 Alt_L's (the Left "Alt" key) taps in a
-row described under \fB-scrollcopyrect\fR instead to manually
-request a screen repaint when it is needed.
+You can use 3 Alt_L's (the Left "Alt" key) taps in
+a row (as described under \fB-scrollcopyrect)\fR instead to
+manually request a screen repaint when it is needed.
 .IP
 \fIstring\fR is a comma separated list of one or more of
-the following: "V=t", "C=t", and "X=t".  In these
-"t" stands for a time in seconds (it is a floating
-point even though one should usually use values > 2 to
-avoid wasting resources).  V sets how frequently the
-entire screen should be sent to viewers (it is like the
-3 Alt_L's).  C sets how long to wait after a CopyRect
-to repaint the full screen.  X sets how frequently
-to reread the full X11 framebuffer from the X server
-and push it out to connected viewers.  Use of X should
-be rare, please report a bug if you find you need it.
-Examples: \fB-fixscreen\fR V=10 \fB-fixscreen\fR C=10
+the following: "V=t", "C=t", "X=t", and "8=t".
+In these "t" stands for a time in seconds (it is
+a floating point even though one should usually use
+values > 2 to avoid wasting resources).  V sets how
+frequently the entire screen should be sent to viewers
+(it is like the 3 Alt_L's).  C sets how long to wait
+after a CopyRect to repaint the full screen.  X sets
+how frequently to reread the full X11 framebuffer from
+the X server and push it out to connected viewers.
+Use of X should be rare, please report a bug if you
+find you need it. 8= applies only for \fB-8to24\fR mode: it
+sets how often the non-default visual regions of the
+screen (e.g. 8bpp windows) are refreshed.  Examples:
+\fB-fixscreen\fR V=10 \fB-fixscreen\fR C=10
 .PP
 \fB-debug_scroll\fR
 .IP

x11vnc/x11vnc.c

@@ -908,6 +908,8 @@ static void print_settings(int try_http, int bg, char *gui_str) {
 	fprintf(stderr, " shiftcmap:  %d\n", shift_cmap);
 	fprintf(stderr, " force_idx:  %d\n", force_indexed_color);
 	fprintf(stderr, " cmap8to24:  %d\n", cmap8to24);
+	fprintf(stderr, " 8to24_opts: %s\n", cmap8to24_str ? cmap8to24_str
+	    : "null");
 	fprintf(stderr, " visual:     %s\n", visual_str ? visual_str
 	    : "null");
 	fprintf(stderr, " overlay:    %d\n", overlay);
@@ -1277,6 +1279,7 @@ int main(int argc, char* argv[]) {
 				char *s = argv[i+1];
 				if (s[0] != '-') {
 					cmap8to24_str = strdup(s);
+					i++;
 				}
 			}
 		} else if (!strcmp(arg, "-visual")) {

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.8 lastmod: 2006-01-21";
+char lastmod[] = "0.8 lastmod: 2006-02-04";
 
 /* X display info */
 

x11vnc/xinerama.c

@@ -213,8 +213,8 @@ static void blackout_tiles(void) {
 					break;
 				}
 			}
-
 			sraRgnReleaseIterator(iter);
+
 			sraRgnDestroy(black_reg);
 			sraRgnDestroy(tile_reg);
 
@@ -322,6 +322,7 @@ static void initialize_xinerama (void) {
 		sprintf(tstr, "%dx%d+%d+%d,", w, h, x, y);
 		strcat(bstr, tstr);
 	}
+	sraRgnReleaseIterator(iter);
 	initialize_blackouts(bstr);
 
 	free(bstr);