From b6498656ae9f7dee3ca2022fdcae5394008936c1 Mon Sep 17 00:00:00 2001
From: runge <runge>
Date: Sat, 7 Apr 2007 21:39:20 +0000
Subject: x11vnc: add gnome, kde, etc. FINDCREATEDISPLAY tags.

---
 x11vnc/user.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'x11vnc/user.c')

diff --git a/x11vnc/user.c b/x11vnc/user.c
index cb2853f..a5ea46c 100644
--- a/x11vnc/user.c
+++ b/x11vnc/user.c
@@ -1505,7 +1505,7 @@ if (0) db = 1;
 			if (strstr(cmd, "FINDCREATEDISPLAY") == cmd) {
 				char *opts = strchr(cmd, '-');
 				char st[] = "";
-				char geom[32];
+				char geom[32], xsess[32];
 				if (opts) {
 					opts++;
 					if (strstr(opts, "xdmcp")) {
@@ -1515,6 +1515,7 @@ if (0) db = 1;
 					opts = st;
 				}
 				sprintf(geom, "NONE");
+				xsess[0] = '\0';
 #if 0
 if (!keep_unixpw_opts) {
 	fprintf(stderr, "no keep_unixpw_opts\n");
@@ -1524,6 +1525,17 @@ if (!keep_unixpw_opts) {
 #endif
 				if (unixpw && keep_unixpw_opts && keep_unixpw_opts[0] != '\0') {
 					char *q, *p, *t = strdup(keep_unixpw_opts);
+					if (strstr(t, "gnome")) {
+						sprintf(xsess, "gnome");
+					} else if (strstr(t, "kde")) {
+						sprintf(xsess, "kde");
+					} else if (strstr(t, "twm")) {
+						sprintf(xsess, "twm");
+					} else if (strstr(t, "fvwm")) {
+						sprintf(xsess, "fvwm");
+					} else if (strstr(t, "failsafe")) {
+						sprintf(xsess, "failsafe");
+					}
 					q = strstr(t, "ge=");
 					if (! q) q = strstr(t, "geom=");
 					if (! q) q = strstr(t, "geometry=");
@@ -1555,15 +1567,18 @@ if (!keep_unixpw_opts) {
 					free(t);
 				}
 				set_env("FD_GEOM", geom);
+				set_env("FD_SESS", xsess);
 				if (unixpw && keep_unixpw_user) {
 					create_cmd = (char *) malloc(strlen(tmp)
-					    + strlen("env USER='' /bin/sh ")
+					    + strlen("env USER='' ")
+					    + strlen("env FD_SESS='' ")
 					    + strlen("env FD_GEOM='' /bin/sh ")
 					    + strlen(keep_unixpw_user) + 1
 					    + strlen(geom) + 1
+					    + strlen(xsess) + 1
 					    + strlen(opts) + 1);
-					sprintf(create_cmd, "env USER='%s' FD_GEOM='%s' /bin/sh %s %s",
-					    keep_unixpw_user, geom, tmp, opts);
+					sprintf(create_cmd, "env USER='%s' FD_GEOM='%s' FD_SESS='%s' /bin/sh %s %s",
+					    keep_unixpw_user, geom, xsess, tmp, opts);
 				} else {
 					create_cmd = (char *) malloc(strlen(tmp)
 					    + strlen("/bin/sh ") + 1 + strlen(opts) + 1);
-- 
cgit v1.2.3