Skip to content

L
libvncserver
Commit be9dc490 authored by runge's avatar runge
Browse files
Options

x11vnc: add xfce to createdisplay

parent 54237e33
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 42 deletions
x11vnc/ChangeLog
View file @ be9dc490
2007-10-03 Karl Runge <runge@karlrunge.com>
* x11vnc: add xfce to createdisplay
2007-09-26 Karl Runge <runge@karlrunge.com> 2007-09-26 Karl Runge <runge@karlrunge.com>
* x11vnc: COLUMNS=256 to find/create scripts. More ratecheck. * x11vnc: COLUMNS=256 to find/create scripts. More ratecheck.
......
x11vnc/README
View file @ be9dc490
x11vnc README file Date: Wed Sep 26 15:16:21 EDT 2007 x11vnc README file Date: Wed Oct 3 18:57:35 EDT 2007
The following information is taken from these URLs: The following information is taken from these URLs:
...@@ -7777,7 +7777,7 @@ References ...@@ -7777,7 +7777,7 @@ References
99. http://www.karlrunge.com/x11vnc/index.html#faq-ssl-tunnel-int 99. http://www.karlrunge.com/x11vnc/index.html#faq-ssl-tunnel-int
100. http://www.karlrunge.com/x11vnc/x11vnc-0.9.3.tar.gz 100. http://www.karlrunge.com/x11vnc/x11vnc-0.9.3.tar.gz
101. http://www.karlrunge.com/x11vnc/bins 101. http://www.karlrunge.com/x11vnc/bins
102. mailto:xvml-beta@karlrunge.com 102. mailto:xvml@karlrunge.com
103. http://www.karlrunge.com/x11vnc/index.html#faq-ssl-tunnel-int 103. http://www.karlrunge.com/x11vnc/index.html#faq-ssl-tunnel-int
104. http://www.karlrunge.com/x11vnc/index.html#ss_vncviewer 104. http://www.karlrunge.com/x11vnc/index.html#ss_vncviewer
105. http://www.karlrunge.com/x11vnc/index.html#faq-ssl-tunnel-ext 105. http://www.karlrunge.com/x11vnc/index.html#faq-ssl-tunnel-ext
...@@ -8405,7 +8405,7 @@ References ...@@ -8405,7 +8405,7 @@ References
727. http://www.karlrunge.com/x11vnc/x11vnc_opts.html#opt-capslock 727. http://www.karlrunge.com/x11vnc/x11vnc_opts.html#opt-capslock
728. http://www.karlrunge.com/x11vnc/index.html#faq-scaling 728. http://www.karlrunge.com/x11vnc/index.html#faq-scaling
729. http://www.karlrunge.com/x11vnc/x11vnc_opts.html#opt-scale 729. http://www.karlrunge.com/x11vnc/x11vnc_opts.html#opt-scale
730. http://www.cus.cam.ac.uk/~ssb22/source/vnc-magnification.html 730. http://people.pwf.cam.ac.uk/ssb22/setup/vnc-magnification.html
731. http://www.karlrunge.com/x11vnc/x11vnc_opts.html#opt-rfbport 731. http://www.karlrunge.com/x11vnc/x11vnc_opts.html#opt-rfbport
732. http://www.karlrunge.com/x11vnc/x11vnc_opts.html#opt-gui 732. http://www.karlrunge.com/x11vnc/x11vnc_opts.html#opt-gui
733. http://www.karlrunge.com/x11vnc/x11vnc_opts.html#opt-connect 733. http://www.karlrunge.com/x11vnc/x11vnc_opts.html#opt-connect
...@@ -11440,7 +11440,7 @@ x11vnc: a VNC server for real X displays ...@@ -11440,7 +11440,7 @@ x11vnc: a VNC server for real X displays
Here are all of x11vnc command line options: Here are all of x11vnc command line options:
% x11vnc -opts (see below for -help long descriptions) % x11vnc -opts (see below for -help long descriptions)
x11vnc: allow VNC connections to real X11 displays. 0.9.3 lastmod: 2007-09-26 x11vnc: allow VNC connections to real X11 displays. 0.9.3 lastmod: 2007-09-30
x11vnc options: x11vnc options:
-display disp -auth file -N -display disp -auth file -N
...@@ -11558,7 +11558,7 @@ libvncserver-tight-extension options: ...@@ -11558,7 +11558,7 @@ libvncserver-tight-extension options:
% x11vnc -help % x11vnc -help
x11vnc: allow VNC connections to real X11 displays. 0.9.3 lastmod: 2007-09-26 x11vnc: allow VNC connections to real X11 displays. 0.9.3 lastmod: 2007-09-30
(type "x11vnc -opts" to just list the options.) (type "x11vnc -opts" to just list the options.)
...@@ -12432,16 +12432,16 @@ Options: ...@@ -12432,16 +12432,16 @@ Options:
your long "login:" line press the Up arrow once your long "login:" line press the Up arrow once
(before typing anything else). (before typing anything else).
Another option is "geom=WxH" or "geom=WxHxD" Another option is "geom=WxH" or "geom=WxHxD" (or
(or ge=). This only has an effect in FINDCREATEDISPLAY ge=). This only has an effect in FINDCREATEDISPLAY
mode when a virtual X server such as Xvfb is going to mode when a virtual X server such as Xvfb is going
be created. It sets the width and height of the new to be created. It sets the width and height of
display, and optionally the color depth as well. You the new display, and optionally the color depth as
can also supply "gnome", "kde", "twm", "fvwm", well. You can also supply "gnome", "kde", "twm",
"mwm", "dtwm", "wmaker", "enlightenment", "fvwm", "mwm", "dtwm", "wmaker", "xfce",
"Xsession", or "failsafe" (same as "xterm") "enlightenment", "Xsession", or "failsafe"
to have the created display use that mode for the (same as "xterm") to have the created display use
user session. that mode for the user session.
To disable the option setting set the environment To disable the option setting set the environment
variable X11VNC_NO_UNIXPW_OPTS=1 before starting x11vnc. variable X11VNC_NO_UNIXPW_OPTS=1 before starting x11vnc.
......
x11vnc/help.c
View file @ be9dc490
...@@ -897,16 +897,16 @@ void print_help(int mode) { ...@@ -897,16 +897,16 @@ void print_help(int mode) {
" your long \"login:\" line press the Up arrow once\n" " your long \"login:\" line press the Up arrow once\n"
" (before typing anything else).\n" " (before typing anything else).\n"
"\n" "\n"
" Another option is \"geom=WxH\" or \"geom=WxHxD\"\n" " Another option is \"geom=WxH\" or \"geom=WxHxD\" (or\n"
" (or ge=). This only has an effect in FINDCREATEDISPLAY\n" " ge=). This only has an effect in FINDCREATEDISPLAY\n"
" mode when a virtual X server such as Xvfb is going to\n" " mode when a virtual X server such as Xvfb is going\n"
" be created. It sets the width and height of the new\n" " to be created. It sets the width and height of\n"
" display, and optionally the color depth as well. You\n" " the new display, and optionally the color depth as\n"
" can also supply \"gnome\", \"kde\", \"twm\", \"fvwm\",\n" " well. You can also supply \"gnome\", \"kde\", \"twm\",\n"
" \"mwm\", \"dtwm\", \"wmaker\", \"enlightenment\",\n" " \"fvwm\", \"mwm\", \"dtwm\", \"wmaker\", \"xfce\",\n"
" \"Xsession\", or \"failsafe\" (same as \"xterm\")\n" " \"enlightenment\", \"Xsession\", or \"failsafe\"\n"
" to have the created display use that mode for the\n" " (same as \"xterm\") to have the created display use\n"
" user session.\n" " that mode for the user session.\n"
"\n" "\n"
" To disable the option setting set the environment\n" " To disable the option setting set the environment\n"
" variable X11VNC_NO_UNIXPW_OPTS=1 before starting x11vnc.\n" " variable X11VNC_NO_UNIXPW_OPTS=1 before starting x11vnc.\n"
......
x11vnc/ssltools.h
View file @ be9dc490
...@@ -1131,6 +1131,12 @@ char create_display[] = ...@@ -1131,6 +1131,12 @@ char create_display[] =
" elif [ \"X$have_wmaker\" != \"X\" -a \"X$FD_SESS\" = \"Xwmaker\" ]; then\n" " elif [ \"X$have_wmaker\" != \"X\" -a \"X$FD_SESS\" = \"Xwmaker\" ]; then\n"
" echo \"$have_wmaker\"\n" " echo \"$have_wmaker\"\n"
" return\n" " return\n"
" elif [ \"X$have_startxfce\" != \"X\" -a \"X$FD_SESS\" = \"Xxfce\" ]; then\n"
" echo \"$have_startxfce\"\n"
" return\n"
" elif [ \"X$have_startxfce4\" != \"X\" -a \"X$FD_SESS\" = \"Xxfce\" ]; then\n"
" echo \"$have_startxfce4\"\n"
" return\n"
" elif [ \"X$have_enlightenment\" != \"X\" -a \"X$FD_SESS\" = \"Xenlightenment\" ]; then\n" " elif [ \"X$have_enlightenment\" != \"X\" -a \"X$FD_SESS\" = \"Xenlightenment\" ]; then\n"
" echo \"$have_enlightenment\"\n" " echo \"$have_enlightenment\"\n"
" return\n" " return\n"
...@@ -1181,7 +1187,7 @@ char create_display[] = ...@@ -1181,7 +1187,7 @@ char create_display[] =
" return\n" " return\n"
" fi\n" " fi\n"
" fi\n" " fi\n"
" for wm in blackbox fvwm icewm wmw openbox twm mwm windowmaker enlightenment metacity\n" " for wm in blackbox fvwm icewm wmw openbox twm mwm windowmaker enlightenment metacity startxfce4 startxfce\n"
" do\n" " do\n"
" eval \"have=\\$have_$wm\"\n" " eval \"have=\\$have_$wm\"\n"
" if [ \"X$have\" = \"X\" ]; then\n" " if [ \"X$have\" = \"X\" ]; then\n"
...@@ -1477,7 +1483,7 @@ char create_display[] = ...@@ -1477,7 +1483,7 @@ char create_display[] =
" if [ \"X$redir_daemon\" != \"X\" -a \"X$result\" = \"X1\" ]; then\n" " if [ \"X$redir_daemon\" != \"X\" -a \"X$result\" = \"X1\" ]; then\n"
" redir_daemon=`echo \"$redir_daemon\" | sed -e 's|[^A-z0-9:,/]||g'`\n" " redir_daemon=`echo \"$redir_daemon\" | sed -e 's|[^A-z0-9:,/]||g'`\n"
" xprog=$X11VNC_PROG\n" " xprog=$X11VNC_PROG\n"
" if [ \"X$xprog\" = \"X\"]; then\n" " if [ \"X$xprog\" = \"X\" ]; then\n"
" xprog=x11vnc\n" " xprog=x11vnc\n"
" fi\n" " fi\n"
" $have_nohup sh -c \"$xprog -sleepin 10 -auth $authfile -tsd $redir_daemon\" 2>.tsd.log.$USER 1>&2 &\n" " $have_nohup sh -c \"$xprog -sleepin 10 -auth $authfile -tsd $redir_daemon\" 2>.tsd.log.$USER 1>&2 &\n"
...@@ -1747,7 +1753,7 @@ char create_display[] = ...@@ -1747,7 +1753,7 @@ char create_display[] =
" p_ok=1\n" " p_ok=1\n"
"fi\n" "fi\n"
"\n" "\n"
"for prog in startx xinit xdm gdm kdm xterm Xdummy Xvfb Xvnc xauth xdpyinfo mcookie md5sum xmodmap startkde gnome-session blackbox fvwm2 mwm openbox twm windowmaker wmaker enlightenment metacity X Xorg XFree86 Xsun Xsession dtwm netstat nohup esddsp konsole gnome-terminal perl\n" "for prog in startx xinit xdm gdm kdm xterm Xdummy Xvfb Xvnc xauth xdpyinfo mcookie md5sum xmodmap startkde gnome-session blackbox fvwm2 mwm openbox twm windowmaker wmaker enlightenment metacity X Xorg XFree86 Xsun Xsession dtwm netstat nohup esddsp konsole gnome-terminal perl startxfce4 startxfce\n"
"do\n" "do\n"
" p2=`echo \"$prog\" | sed -e 's/-/_/g'`\n" " p2=`echo \"$prog\" | sed -e 's/-/_/g'`\n"
" eval \"have_$p2=''\"\n" " eval \"have_$p2=''\"\n"
......
x11vnc/user.c
View file @ be9dc490
...@@ -1989,6 +1989,8 @@ if (0) db = 1; ...@@ -1989,6 +1989,8 @@ if (0) db = 1;
sprintf(fdsess, "xterm"); sprintf(fdsess, "xterm");
} else if (strstr(t, "wmaker")) { } else if (strstr(t, "wmaker")) {
sprintf(fdsess, "wmaker"); sprintf(fdsess, "wmaker");
} else if (strstr(t, "xfce")) {
sprintf(fdsess, "xfce");
} else if (strstr(t, "enlightenment")) { } else if (strstr(t, "enlightenment")) {
sprintf(fdsess, "enlightenment"); sprintf(fdsess, "enlightenment");
} else if (strstr(t, "Xsession")) { } else if (strstr(t, "Xsession")) {
......
x11vnc/x11vnc.1
View file @ be9dc490
.\" This file was automatically generated from x11vnc -help output. .\" This file was automatically generated from x11vnc -help output.
.TH X11VNC "1" "September 2007" "x11vnc " "User Commands" .TH X11VNC "1" "October 2007" "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.3, lastmod: 2007-09-26 version: 0.9.3, lastmod: 2007-09-30
.SH SYNOPSIS .SH SYNOPSIS
.B x11vnc .B x11vnc
[OPTION]... [OPTION]...
...@@ -1071,16 +1071,16 @@ type and enter your password incorrectly, to retrieve ...@@ -1071,16 +1071,16 @@ type and enter your password incorrectly, to retrieve
your long "login:" line press the Up arrow once your long "login:" line press the Up arrow once
(before typing anything else). (before typing anything else).
.IP .IP
Another option is "geom=WxH" or "geom=WxHxD" Another option is "geom=WxH" or "geom=WxHxD" (or
(or ge=). This only has an effect in FINDCREATEDISPLAY ge=). This only has an effect in FINDCREATEDISPLAY
mode when a virtual X server such as Xvfb is going to mode when a virtual X server such as Xvfb is going
be created. It sets the width and height of the new to be created. It sets the width and height of
display, and optionally the color depth as well. You the new display, and optionally the color depth as
can also supply "gnome", "kde", "twm", "fvwm", well. You can also supply "gnome", "kde", "twm",
"mwm", "dtwm", "wmaker", "enlightenment", "fvwm", "mwm", "dtwm", "wmaker", "xfce",
"Xsession", or "failsafe" (same as "xterm") "enlightenment", "Xsession", or "failsafe"
to have the created display use that mode for the (same as "xterm") to have the created display use
user session. that mode for the user session.
.IP .IP
To disable the option setting set the environment To disable the option setting set the environment
variable X11VNC_NO_UNIXPW_OPTS=1 before starting x11vnc. variable X11VNC_NO_UNIXPW_OPTS=1 before starting x11vnc.
......
x11vnc/x11vnc.c
View file @ be9dc490
...@@ -1240,7 +1240,7 @@ static void watch_loop(void) { ...@@ -1240,7 +1240,7 @@ static void watch_loop(void) {
if (use_snapfb) { if (use_snapfb) {
int t, tries = 3; int t, tries = 3;
copy_snap(); copy_snap();
for (t =0; t < tries; t++) { for (t=0; t < tries; t++) {
tile_diffs = scan_for_updates(0); tile_diffs = scan_for_updates(0);
} }
} else { } else {
......
x11vnc/x11vnc_defs.c
View file @ be9dc490
...@@ -15,7 +15,7 @@ int xtrap_base_event_type = 0; ...@@ -15,7 +15,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.3 lastmod: 2007-09-26"; char lastmod[] = "0.9.3 lastmod: 2007-09-30";
/* 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