x11vnc: add xfce to createdisplay

8 files changed, 53 insertions, 42 deletions

diff --git a/x11vnc/ChangeLog b/x11vnc/ChangeLog
index 748f6b3..058ad18 100644
--- a/x11vnc/ChangeLog
+++ b/x11vnc/ChangeLog
@@ -1,3 +1,6 @@
+2007-10-03  Karl Runge <[email protected]>
+	* x11vnc: add xfce to createdisplay
+
 2007-09-26  Karl Runge <[email protected]>
 	* x11vnc: COLUMNS=256 to find/create scripts. More ratecheck.
 
diff --git a/x11vnc/README b/x11vnc/README
index 50fb853..25d169d 100644
--- a/x11vnc/README
+++ b/x11vnc/README
@@ -1,5 +1,5 @@
 
-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:
 
@@ -7777,7 +7777,7 @@ References
   99. http://www.karlrunge.com/x11vnc/index.html#faq-ssl-tunnel-int
  100. http://www.karlrunge.com/x11vnc/x11vnc-0.9.3.tar.gz
  101. http://www.karlrunge.com/x11vnc/bins
- 102. mailto:[email protected]
+ 102. mailto:[email protected]
  103. http://www.karlrunge.com/x11vnc/index.html#faq-ssl-tunnel-int
  104. http://www.karlrunge.com/x11vnc/index.html#ss_vncviewer
  105. http://www.karlrunge.com/x11vnc/index.html#faq-ssl-tunnel-ext
@@ -8405,7 +8405,7 @@ References
  727. http://www.karlrunge.com/x11vnc/x11vnc_opts.html#opt-capslock
  728. http://www.karlrunge.com/x11vnc/index.html#faq-scaling
  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
  732. http://www.karlrunge.com/x11vnc/x11vnc_opts.html#opt-gui
  733. http://www.karlrunge.com/x11vnc/x11vnc_opts.html#opt-connect
@@ -11440,7 +11440,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.9.3 lastmod: 2007-09-26
+x11vnc: allow VNC connections to real X11 displays. 0.9.3 lastmod: 2007-09-30
 
 x11vnc options:
   -display disp            -auth file               -N                     
@@ -11558,7 +11558,7 @@ libvncserver-tight-extension options:
 
 % 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.)
 
@@ -12432,16 +12432,16 @@ Options:
                        your long "login:" line press the Up arrow once
                        (before typing anything else).
 
-                       Another option is "geom=WxH" or "geom=WxHxD"
-                       (or ge=). This only has an effect in FINDCREATEDISPLAY
-                       mode when a virtual X server such as Xvfb is going to
-                       be created.  It sets the width and height of the new
-                       display, and optionally the color depth as well. You
-                       can also supply "gnome", "kde", "twm", "fvwm",
-                       "mwm", "dtwm", "wmaker", "enlightenment",
-                       "Xsession", or "failsafe" (same as "xterm")
-                       to have the created display use that mode for the
-                       user session.
+                       Another option is "geom=WxH" or "geom=WxHxD" (or
+                       ge=). This only has an effect in FINDCREATEDISPLAY
+                       mode when a virtual X server such as Xvfb is going
+                       to be created.  It sets the width and height of
+                       the new display, and optionally the color depth as
+                       well. You can also supply "gnome", "kde", "twm",
+                       "fvwm", "mwm", "dtwm", "wmaker", "xfce",
+                       "enlightenment", "Xsession", or "failsafe"
+                       (same as "xterm") to have the created display use
+                       that mode for the user session.
 
                        To disable the option setting set the environment
                        variable X11VNC_NO_UNIXPW_OPTS=1 before starting x11vnc.
diff --git a/x11vnc/help.c b/x11vnc/help.c
index 75d8700..7d41797 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -897,16 +897,16 @@ void print_help(int mode) {
 "                       your long \"login:\" line press the Up arrow once\n"
 "                       (before typing anything else).\n"
 "\n"
-"                       Another option is \"geom=WxH\" or \"geom=WxHxD\"\n"
-"                       (or ge=). This only has an effect in FINDCREATEDISPLAY\n"
-"                       mode when a virtual X server such as Xvfb is going to\n"
-"                       be created.  It sets the width and height of the new\n"
-"                       display, and optionally the color depth as well. You\n"
-"                       can also supply \"gnome\", \"kde\", \"twm\", \"fvwm\",\n"
-"                       \"mwm\", \"dtwm\", \"wmaker\", \"enlightenment\",\n"
-"                       \"Xsession\", or \"failsafe\" (same as \"xterm\")\n"
-"                       to have the created display use that mode for the\n"
-"                       user session.\n"
+"                       Another option is \"geom=WxH\" or \"geom=WxHxD\" (or\n"
+"                       ge=). This only has an effect in FINDCREATEDISPLAY\n"
+"                       mode when a virtual X server such as Xvfb is going\n"
+"                       to be created.  It sets the width and height of\n"
+"                       the new display, and optionally the color depth as\n"
+"                       well. You can also supply \"gnome\", \"kde\", \"twm\",\n"
+"                       \"fvwm\", \"mwm\", \"dtwm\", \"wmaker\", \"xfce\",\n"
+"                       \"enlightenment\", \"Xsession\", or \"failsafe\"\n"
+"                       (same as \"xterm\") to have the created display use\n"
+"                       that mode for the user session.\n"
 "\n"
 "                       To disable the option setting set the environment\n"
 "                       variable X11VNC_NO_UNIXPW_OPTS=1 before starting x11vnc.\n"
diff --git a/x11vnc/ssltools.h b/x11vnc/ssltools.h
index caeb7ad..cd61a15 100644
--- a/x11vnc/ssltools.h
+++ b/x11vnc/ssltools.h
@@ -1131,6 +1131,12 @@ char create_display[] =
 "	elif [ \"X$have_wmaker\" != \"X\"      -a \"X$FD_SESS\" = \"Xwmaker\" ]; then\n"
 "		echo \"$have_wmaker\"\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"
 "		echo \"$have_enlightenment\"\n"
 "		return\n"
@@ -1181,7 +1187,7 @@ char create_display[] =
 "				return\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"
 "			eval \"have=\\$have_$wm\"\n"
 "			if [ \"X$have\" = \"X\" ]; then\n"
@@ -1477,7 +1483,7 @@ char create_display[] =
 "	if [ \"X$redir_daemon\" != \"X\" -a \"X$result\" = \"X1\" ]; then\n"
 "		redir_daemon=`echo \"$redir_daemon\" | sed -e 's|[^A-z0-9:,/]||g'`\n"
 "		xprog=$X11VNC_PROG\n"
-"		if [ \"X$xprog\" = \"X\"]; then\n"
+"		if [ \"X$xprog\" = \"X\" ]; then\n"
 "			xprog=x11vnc\n"
 "		fi\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[] =
 "	p_ok=1\n"
 "fi\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"
 "	p2=`echo \"$prog\" | sed -e 's/-/_/g'`\n"
 "	eval \"have_$p2=''\"\n"
diff --git a/x11vnc/user.c b/x11vnc/user.c
index 444fd17..91f1840 100644
--- a/x11vnc/user.c
+++ b/x11vnc/user.c
@@ -1989,6 +1989,8 @@ if (0) db = 1;
 						sprintf(fdsess, "xterm");
 					} else if (strstr(t, "wmaker")) {
 						sprintf(fdsess, "wmaker");
+					} else if (strstr(t, "xfce")) {
+						sprintf(fdsess, "xfce");
 					} else if (strstr(t, "enlightenment")) {
 						sprintf(fdsess, "enlightenment");
 					} else if (strstr(t, "Xsession")) {
diff --git a/x11vnc/x11vnc.1 b/x11vnc/x11vnc.1
index 5ce8b5c..0dec828 100644
--- a/x11vnc/x11vnc.1
+++ b/x11vnc/x11vnc.1
@@ -1,8 +1,8 @@
 .\" 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
 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
 .B x11vnc
 [OPTION]...
@@ -1071,16 +1071,16 @@ type and enter your password incorrectly, to retrieve
 your long "login:" line press the Up arrow once
 (before typing anything else).
 .IP
-Another option is "geom=WxH" or "geom=WxHxD"
-(or ge=). This only has an effect in FINDCREATEDISPLAY
-mode when a virtual X server such as Xvfb is going to
-be created.  It sets the width and height of the new
-display, and optionally the color depth as well. You
-can also supply "gnome", "kde", "twm", "fvwm",
-"mwm", "dtwm", "wmaker", "enlightenment",
-"Xsession", or "failsafe" (same as "xterm")
-to have the created display use that mode for the
-user session.
+Another option is "geom=WxH" or "geom=WxHxD" (or
+ge=). This only has an effect in FINDCREATEDISPLAY
+mode when a virtual X server such as Xvfb is going
+to be created.  It sets the width and height of
+the new display, and optionally the color depth as
+well. You can also supply "gnome", "kde", "twm",
+"fvwm", "mwm", "dtwm", "wmaker", "xfce",
+"enlightenment", "Xsession", or "failsafe"
+(same as "xterm") to have the created display use
+that mode for the user session.
 .IP
 To disable the option setting set the environment
 variable X11VNC_NO_UNIXPW_OPTS=1 before starting x11vnc.
diff --git a/x11vnc/x11vnc.c b/x11vnc/x11vnc.c
index b31284f..19707fd 100644
--- a/x11vnc/x11vnc.c
+++ b/x11vnc/x11vnc.c
@@ -1240,7 +1240,7 @@ static void watch_loop(void) {
 			if (use_snapfb) {
 				int t, tries = 3;
 				copy_snap();
-				for (t =0; t < tries; t++) {
+				for (t=0; t < tries; t++) {
 					tile_diffs = scan_for_updates(0);
 				}
 			} else {
diff --git a/x11vnc/x11vnc_defs.c b/x11vnc/x11vnc_defs.c
index c8966e7..0480766 100644
--- a/x11vnc/x11vnc_defs.c
+++ b/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.3 lastmod: 2007-09-26";
+char lastmod[] = "0.9.3 lastmod: 2007-09-30";
 
 /* X display info */