Commit a795da8d authored by runge's avatar runge

x11vnc: rename -create_x to -create_xsrv. Hopefully done fixing Xdummy.

parent 5764cd3f
2009-12-29 Karl Runge <runge@karlrunge.com>
* x11vnc: rename -create_x to -create_xsrv. Hopefully
done fixing Xdummy.
2009-12-28 Karl Runge <runge@karlrunge.com> 2009-12-28 Karl Runge <runge@karlrunge.com>
* x11vnc: Fix problems in --without-x builds. Fix crash * x11vnc: Fix problems in --without-x builds. Fix crash
with -QD query for dbus info. Adjust window size for with -QD query for dbus info. Adjust window size for
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -1119,9 +1119,10 @@ void print_help(int mode) { ...@@ -1119,9 +1119,10 @@ void print_help(int mode) {
"-xvnc_redirect As in -create, except Xvnc.redirect instead of Xvfb.\n" "-xvnc_redirect As in -create, except Xvnc.redirect instead of Xvfb.\n"
"-xdummy_xvfb Sets WAIT:cmd=FINDCREATEDISPLAY-Xdummy,Xvfb\n" "-xdummy_xvfb Sets WAIT:cmd=FINDCREATEDISPLAY-Xdummy,Xvfb\n"
"\n" "\n"
"-create_x str Sets WAIT:cmd=FINDCREATEDISPLAY-<str> Can be on cmdline\n" "-create_xsrv str Sets WAIT:cmd=FINDCREATEDISPLAY-<str> Can be on cmdline\n"
" after anything that sets WAIT:.. and other things\n" " after anything that sets WAIT:.. and other things\n"
" (e.g. -svc, -xdmsvc) to adjust the X server list.\n" " (e.g. -svc, -xdmsvc) to adjust the X server list.\n"
" Example: -svc ... -create_xsrv Xdummy,X\n"
"\n" "\n"
"-svc Terminal services mode based on SSL access. Alias for\n" "-svc Terminal services mode based on SSL access. Alias for\n"
" -display WAIT:cmd=FINDCREATEDISPLAY-Xvfb -unixpw -users\n" " -display WAIT:cmd=FINDCREATEDISPLAY-Xvfb -unixpw -users\n"
......
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.TH X11VNC "1" "December 2009" "x11vnc " "User Commands" .TH X11VNC "1" "December 2009" "x11vnc " "User Commands"
.SH NAME .SH NAME
x11vnc - allow VNC connections to real X11 displays x11vnc - allow VNC connections to real X11 displays
version: 0.9.10, lastmod: 2009-12-27 version: 0.9.10, lastmod: 2009-12-28
.SH SYNOPSIS .SH SYNOPSIS
.B x11vnc .B x11vnc
[OPTION]... [OPTION]...
...@@ -1251,11 +1251,12 @@ As in \fB-create,\fR except Xvnc.redirect instead of Xvfb. ...@@ -1251,11 +1251,12 @@ As in \fB-create,\fR except Xvnc.redirect instead of Xvfb.
.IP .IP
Sets WAIT:cmd=FINDCREATEDISPLAY-Xdummy,Xvfb Sets WAIT:cmd=FINDCREATEDISPLAY-Xdummy,Xvfb
.PP .PP
\fB-create_x\fR \fIstr\fR \fB-create_xsrv\fR \fIstr\fR
.IP .IP
Sets WAIT:cmd=FINDCREATEDISPLAY-<str> Can be on cmdline Sets WAIT:cmd=FINDCREATEDISPLAY-<str> Can be on cmdline
after anything that sets WAIT:.. and other things after anything that sets WAIT:.. and other things
(e.g. \fB-svc,\fR \fB-xdmsvc)\fR to adjust the X server list. (e.g. \fB-svc,\fR \fB-xdmsvc)\fR to adjust the X server list.
Example: \fB-svc\fR ... \fB-create_xsrv\fR Xdummy,X
.PP .PP
\fB-svc\fR \fB-svc\fR
.IP .IP
......
...@@ -2221,7 +2221,7 @@ int main(int argc, char* argv[]) { ...@@ -2221,7 +2221,7 @@ int main(int argc, char* argv[]) {
use_dpy = strdup("WAIT:cmd=FINDCREATEDISPLAY-Xvfb"); use_dpy = strdup("WAIT:cmd=FINDCREATEDISPLAY-Xvfb");
continue; continue;
} }
if (!strcmp(arg, "-create_x")) { if (!strcmp(arg, "-create_xsrv")) {
CHECK_ARGC CHECK_ARGC
use_dpy = (char *) malloc(strlen(argv[i+1])+100); use_dpy = (char *) malloc(strlen(argv[i+1])+100);
sprintf(use_dpy, "WAIT:cmd=FINDCREATEDISPLAY-%s", argv[++i]); sprintf(use_dpy, "WAIT:cmd=FINDCREATEDISPLAY-%s", argv[++i]);
......
...@@ -47,7 +47,7 @@ int xtrap_base_event_type = 0; ...@@ -47,7 +47,7 @@ int xtrap_base_event_type = 0;
int xdamage_base_event_type = 0; int xdamage_base_event_type = 0;
/* date +'lastmod: %Y-%m-%d' */ /* date +'lastmod: %Y-%m-%d' */
char lastmod[] = "0.9.10 lastmod: 2009-12-27"; char lastmod[] = "0.9.10 lastmod: 2009-12-28";
/* X display info */ /* X display info */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment