x11vnc: -8to24 speedups and improvements.

pull/1/head
runge 18 years ago
parent 1967913e95
commit d0ef1285b8

File diff suppressed because it is too large Load Diff

@ -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 */

@ -1,3 +1,6 @@
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.

@ -1,5 +1,5 @@
x11vnc README file Date: Sat Jan 21 20:25:28 EST 2006
x11vnc README file Date: Sat Feb 4 22:21:00 EST 2006
The following information is taken from these URLs:
@ -585,7 +585,7 @@ make
I'd appreciate any additional testing very much!
Please help test and debug the 0.8 version for release sometime in
Jan/2006.
Feb/2006.
[53]x11vnc-0.8.tar.gz
@ -4289,7 +4289,7 @@ ied)
Based on the bpp x11vnc will try to guess the red, green, and blue
masks (these indicate which bits correspond to each color). It if gets
it wrong you can specify them manually via the optional ":R/G/B"
field. E.g. ":0xff000/0x00ff00/0x0000ff" (this is the default for
field. E.g. ":0xff0000/0x00ff00/0x0000ff" (this is the default for
32bpp).
Finally, the framebuffer may not begin at the beginning of the memory
@ -4898,7 +4898,7 @@ x11vnc: a VNC server for real X displays
Here are all of x11vnc command line options:
% x11vnc -opts (see below for -help long descriptions)
x11vnc: allow VNC connections to real X11 displays. 0.8 lastmod: 2006-01-21
x11vnc: allow VNC connections to real X11 displays. 0.8 lastmod: 2006-02-04
x11vnc options:
-display disp -auth file
@ -5009,7 +5009,7 @@ libvncserver-tight-extension options:
% x11vnc -help
x11vnc: allow VNC connections to real X11 displays. 0.8 lastmod: 2006-01-21
x11vnc: allow VNC connections to real X11 displays. 0.8 lastmod: 2006-02-04
Typical usage is:
@ -5143,55 +5143,66 @@ Options:
-8to24 [opts] Try this option if -overlay 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.
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 -flashcmap).
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.
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, -fixscreen 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.
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.
Note that even if there are *no* depth 24 visuals or
windows (i.e. pure 8bpp), this mode is potentially
a improvement over -flashcmap because it avoids the
flashing and shows each window in the correct color.
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.
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 -fixscreen 8=3.0 or -fixscreen V=3.0 may be
use to periodically refresh the screen at the cost of
bandwidth (every 3 sec for this example).
The [opts] string can contain the following settings.
Multiple settings are separated by commas.
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.
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.
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)
Debugging for this mode can be enabled by setting
"dbg=1", "dbg=2", or "dbg=3"
"dbg=1", "dbg=2", or "dbg=3".
-scale fraction Scale the framebuffer by factor "fraction". Values
less than 1 shrink the fb, larger ones expand it. Note:
@ -6185,22 +6196,25 @@ Options:
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 -scrollcopyrect 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 -scrollcopyrect) instead to
manually request a screen repaint when it is needed.
"string" 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: -fixscreen V=10 -fixscreen 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 -8to24 mode: it
sets how often the non-default visual regions of the
screen (e.g. 8bpp windows) are refreshed. Examples:
-fixscreen V=10 -fixscreen C=10
-debug_scroll Turn on debugging info printout for the scroll
heuristics. "-ds" is an alias. Specify it multiple

@ -151,55 +151,66 @@ void print_help(int mode) {
"-8to24 [opts] Try this option if -overlay is not supported on your\n"
" OS, and you have a legacy 8bpp app that you want to\n"
" view on a multi-depth display with default depth 24\n"
" (and is 32 bpp) or have default depth 8 display with\n"
" (and is 32 bpp) OR have a default depth 8 display with\n"
" depth 24 overlay windows for some apps. This option\n"
" may not work on all X servers and hardware (tested on\n"
" XFree86/Xorg mga driver). The \"opts\" string is not\n"
" required and is described below.\n"
" may not work on all X servers and hardware (tested\n"
" on XFree86/Xorg mga driver and Xsun). The \"opts\"\n"
" string is not required and is described below.\n"
"\n"
" This mode enables a hack where x11vnc monitors windows\n"
" within 3 levels from the root window. If it finds\n"
" any that are 8bpp it will apply a transformation for\n"
" pixel data in these regions where it extracts the 8bpp\n"
" index color value from bits 25-32 and maps them on\n"
" to TrueColor values and inserts them into bits 1-24\n"
" (i.e. overwrites bits 1-24). Whereas for default\n"
" depth 8 displays, everything is tranformed to 32bpp\n"
" (and is potentially a improvement over -flashcmap).\n"
"\n"
" These schemes appear to work, but may still have\n"
" bugs and note that they do hog resources. If there\n"
" are multiple 8bpp windows using different colormaps,\n"
" one may have to iconify all but one for the colors to\n"
" be correct.\n"
"\n"
" There may also be painting errors for clipping and\n"
" switching between windows of depths 8 and 24.\n"
" Heuristics are applied to try to minimize the painting\n"
" errors. One can also press 3 Alt_L's in a row to\n"
" refresh the screen if the error does not repair itself.\n"
" Also the option, say, -fixscreen V=3.0 may be use\n"
" to periodically refresh the screen (at the cost of\n"
" bandwidth).\n"
" any that are 8bpp it extracts the indexed color\n"
" pixel values using XGetImage() and then applies a\n"
" transformation using the colormap(s) to create TrueColor\n"
" RGB values that it in turn inserts into bits 1-24 of\n"
" the framebuffer. This creates a depth 24 \"view\"\n"
" of the display that is then exported via VNC.\n"
"\n"
" Conversely, for default depth 8 displays, the depth\n"
" 24 regions are read by XGetImage() and everything is\n"
" transformed and inserted into a depth 24 TrueColor\n"
" framebuffer.\n"
"\n"
" Note that even if there are *no* depth 24 visuals or\n"
" windows (i.e. pure 8bpp), this mode is potentially\n"
" a improvement over -flashcmap because it avoids the\n"
" flashing and shows each window in the correct color.\n"
"\n"
" This method appear to work, but may still have bugs\n"
" and it does hog resources. If there are multiple 8bpp\n"
" windows using different colormaps, one may have to\n"
" iconify all but one for the colors to be correct.\n"
"\n"
" There may be painting errors for clipping and switching\n"
" between windows of depths 8 and 24. Heuristics are\n"
" applied to try to minimize the painting errors.\n"
" One can also press 3 Alt_L's in a row to refresh the\n"
" screen if the error does not repair itself. Also the\n"
" option -fixscreen 8=3.0 or -fixscreen V=3.0 may be\n"
" use to periodically refresh the screen at the cost of\n"
" bandwidth (every 3 sec for this example).\n"
"\n"
" The [opts] string can contain the following settings.\n"
" Multiple settings are separated by commas.\n"
"\n"
" For when there are still color problems, enable an even\n"
" more experimental mode via the option \"getimage\".\n"
" This enables a scheme were XGetImage() is used to\n"
" retrieve the 8bpp data instead of assuming that data\n"
" is in bits 25-32. This mode is significantly slower\n"
" than the above mode. For the default depth 8 case,\n"
" XGetImage() is always used to access depth 24 pixel\n"
" data.\n"
"\n"
" For default depth 8 displays, setting option\n"
" \"highbits\" may give a speedup for transforming 8bpp\n"
" pixel data.\n"
" For for some X servers with default depth 24 a\n"
" speedup may be achieved via the option \"nogetimage\".\n"
" This enables a scheme were XGetImage() is not used\n"
" to retrieve the 8bpp data. Instead, it assumes that\n"
" the 8bpp data is in bits 25-32 of the 32bit X pixels.\n"
" There is no reason the X server should put the data\n"
" there for our poll requests, but some do and so the\n"
" extra steps to retrieve it can be skipped. Tested with\n"
" mga driver with XFree86/Xorg. For the default depth\n"
" 8 case this option is ignored.\n"
"\n"
" To adjust how often XGetImage() is used to poll the\n"
" non-default visual regions for changes, use the option\n"
" \"poll=t\" where \"t\" is a floating point time.\n"
" (default: %.2f)\n"
"\n"
" Debugging for this mode can be enabled by setting \n"
" \"dbg=1\", \"dbg=2\", or \"dbg=3\"\n"
" \"dbg=1\", \"dbg=2\", or \"dbg=3\".\n"
"\n"
"-scale fraction Scale the framebuffer by factor \"fraction\". Values\n"
" less than 1 shrink the fb, larger ones expand it. Note:\n"
@ -1202,22 +1213,25 @@ void print_help(int mode) {
" but it can be used for any scenario. This option\n"
" periodically performs costly operations and so\n"
" interactive response may be reduced when it is on.\n"
" You can use 3 Alt_L's (the Left \"Alt\" key) taps in a\n"
" row described under -scrollcopyrect instead to manually\n"
" request a screen repaint when it is needed.\n"
" You can use 3 Alt_L's (the Left \"Alt\" key) taps in\n"
" a row (as described under -scrollcopyrect) instead to\n"
" manually request a screen repaint when it is needed.\n"
"\n"
" \"string\" is a comma separated list of one or more of\n"
" the following: \"V=t\", \"C=t\", and \"X=t\". In these\n"
" \"t\" stands for a time in seconds (it is a floating\n"
" point even though one should usually use values > 2 to\n"
" avoid wasting resources). V sets how frequently the\n"
" entire screen should be sent to viewers (it is like the\n"
" 3 Alt_L's). C sets how long to wait after a CopyRect\n"
" to repaint the full screen. X sets how frequently\n"
" to reread the full X11 framebuffer from the X server\n"
" and push it out to connected viewers. Use of X should\n"
" be rare, please report a bug if you find you need it.\n"
" Examples: -fixscreen V=10 -fixscreen C=10\n"
" the following: \"V=t\", \"C=t\", \"X=t\", and \"8=t\".\n"
" In these \"t\" stands for a time in seconds (it is\n"
" a floating point even though one should usually use\n"
" values > 2 to avoid wasting resources). V sets how\n"
" frequently the entire screen should be sent to viewers\n"
" (it is like the 3 Alt_L's). C sets how long to wait\n"
" after a CopyRect to repaint the full screen. X sets\n"
" how frequently to reread the full X11 framebuffer from\n"
" the X server and push it out to connected viewers.\n"
" Use of X should be rare, please report a bug if you\n"
" find you need it. 8= applies only for -8to24 mode: it\n"
" sets how often the non-default visual regions of the\n"
" screen (e.g. 8bpp windows) are refreshed. Examples:\n"
" -fixscreen V=10 -fixscreen C=10\n"
"\n"
"-debug_scroll Turn on debugging info printout for the scroll\n"
" heuristics. \"-ds\" is an alias. Specify it multiple\n"
@ -2062,6 +2076,7 @@ void print_help(int mode) {
exit(1);
}
fprintf(stderr, help, lastmod,
POLL_8TO24_DELAY,
scaling_copyrect ? ":cr":":nocr",
view_only ? "on":"off",
shared ? "on":"off",

@ -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

@ -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;

@ -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 */

@ -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);

@ -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) {

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

@ -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,10 +930,9 @@ 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);
memcpy(dst, src, (x1-x0)*pixelsize);
/* apply the shade/color to make the wireframe line: */
if (! color) {
@ -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 (frame_changed && cmap8to24 && multivis_count) {
/* handle -8to24 tweak, mark area and check 8bpp... */
if (0) {
/* No longer needed. see draw_box() */
if (frame_changed && cmap8to24 && multivis_count) {
/* 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;

@ -1,8 +1,8 @@
.\" 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

@ -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")) {

@ -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 */

@ -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);

Loading…
Cancel
Save