Add "display_name" configuration option and use its value instead of
the hard coded one.

Patch by Diego N. Barbato

--- a/app.cpp	1970-01-01 01:00:00.000000000 +0100
+++ b/app.cpp	2019-04-27 13:48:23.479133531 +0200
@@ -190,7 +190,13 @@
 }
 
 void App::Run() {
-	DisplayName = DISPLAY;
+	/* Read configuration */
+	cfg = new Cfg;
+	char *cfgfile = getenv("SLIM_CFGFILE");
+	if (!cfgfile) cfgfile = CFGFILE;
+	cfg->readConf(cfgfile);
+
+	DisplayName = cfg->getOption("display_name").c_str();
 
 #ifdef XNEST_DEBUG
 	char* p = getenv("DISPLAY");
@@ -200,11 +206,7 @@
 	}
 #endif
 
-	/* Read configuration and theme */
-	cfg = new Cfg;
-	char *cfgfile = getenv("SLIM_CFGFILE");
-	if (!cfgfile) cfgfile = CFGFILE;
-	cfg->readConf(cfgfile);
+	/* Read theme */
 	string themebase = "";
 	string themefile = "";
 	string themedir = "";
@@ -911,9 +913,7 @@
 	static const int MAX_XSERVER_ARGS = 256;
 	static char* server[MAX_XSERVER_ARGS+2] = { NULL };
 	server[0] = (char *)cfg->getOption("default_xserver").c_str();
-	string argOption = cfg->getOption("xserver_arguments");
-	/* Add mandatory -xauth option */
-	argOption = argOption + " -auth " + cfg->getOption("authfile");
+	string argOption = cfg->getOption("display_name") + " " + cfg->getOption("xserver_arguments") + " -auth " + cfg->getOption("authfile");
 	char* args = new char[argOption.length()+2]; /* NULL plus vt */
 	strcpy(args, argOption.c_str());
 
@@ -1233,7 +1233,7 @@
 	authfile = cfg->getOption("authfile");
 	remove(authfile.c_str());
 	putenv(StrConcat("XAUTHORITY=", authfile.c_str()));
-	Util::add_mcookie(mcookie, ":0", cfg->getOption("xauth_path"),
+	Util::add_mcookie(mcookie, cfg->getOption("display_name").c_str(), cfg->getOption("xauth_path"),
 	  authfile);
 }
 
--- a/cfg.cpp	1970-01-01 01:00:00.000000000 +0100
+++ b/cfg.cpp	2019-04-27 13:49:40.511773743 +0200
@@ -31,6 +31,7 @@
 	/* Configuration options */
 	options.insert(option("default_path","/bin:/usr/bin:/usr/local/bin"));
 	options.insert(option("default_xserver","/usr/bin/X"));
+	options.insert(option("display_name",":0.0"));
 	options.insert(option("xserver_arguments",""));
 	options.insert(option("numlock",""));
 	options.insert(option("daemon",""));
--- a/switchuser.cpp	1970-01-01 01:00:00.000000000 +0100
+++ b/switchuser.cpp	2019-04-27 13:50:19.380096651 +0200
@@ -54,6 +54,6 @@
 	string home = string(Pw->pw_dir);
 	string authfile = home + "/.Xauthority";
 	remove(authfile.c_str());
-	Util::add_mcookie(mcookie, ":0", cfg->getOption("xauth_path"),
+	Util::add_mcookie(mcookie, displayName.c_str(), cfg->getOption("xauth_path"),
 	  authfile);
 }
r</th></tr>
<tr><td><span title='2020-12-14 12:15:06 -0500'>2020-12-14</span></td><td><a href='/guix/commit/etc/git/pre-push?id=80ebcdd100a82fdc582e62f35042c74ce38ea753'>maint: Only run `make authenticate` when pushing commits.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/git/pre-push: Exit early when deleting a branch.
</span></span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2020-06-01 00:51:38 +0200'>2020-06-01</span></td><td><a href='/guix/commit/etc/git/pre-push?id=6f6758c45d3913dbf98bb8e50f21f7bfb25b40ea'>maint: Adjust comment in 'pre-push' hook.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/git/pre-push: Adjust comment.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-05-29 18:31:38 +0200'>2020-05-29</span></td><td><a href='/guix/commit/etc/git/pre-push?id=e65a44649e8d7698c4a888f1de625a67052520e9'>maint: Git pre-push hook runs "make authenticate check-channel-news".</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/git/pre-push: Change to run "make authenticate check-channel-news".
</span></span></td><td>Ludovic Courtès</td></tr>
7e12d6ee2ddb7fec'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.fi.po: New file.
* po/doc/guix-manual.fi.po: New file.
* po/doc/local.mk: Add them.
* doc/local.mk: Add them.
* po/guix/fi.po: New file.
* po/guix/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-12-04 19:40:52 +0100'>2021-12-04</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=7fcb20a8fa242ab53b9bc97ef0b0367c6a399bd4'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-11-06 14:06:36 +0100'>2021-11-06</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=85430a9ea6f32aaae3e34741e292a01a2de62ee0'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.es.po: New file.
* po/doc/local.mk: Add 'es' cookbook.
* doc/local.mk: Add 'es' cookbook.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-10-17 22:10:25 +0200'>2021-10-17</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=15c91189cb61c579f4289047c79530cefe75215f'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-09-02 04:06:52 +0200'>2021-09-02</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=1ff2092a39dc5c7c7cd9b4a0ba4b59f92e738efc'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/packages/it.po: New file.
* po/packages/LINGUAS: Add `it'.
* po/*/*.po: Update translations.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-08-04 14:49:53 +0200'>2021-08-04</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=6c10c96fedf707d7be059aeb79bd5c8e2d2fa210'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.ru.po: New file.
* po/doc/guix-cookbook.sk.po: New file.
* po/*/*.po: Update translations.
* doc/local.mk (COOKBOOK_LANGUAGES): Add ru and sk.
(info_TEXINFOS): Add Russian and Slovak cookbooks.
* po/doc/local.mk (DOC_COOKBOOK_PO_FILES): Add Russian and Slovak po
files.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-05-10 22:34:43 -0400'>2021-05-10</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=21fcced608c93e1ac836cdd9ab8c5d200c667e75'>nls: Update translations.</a></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-04-18 13:18:34 +0200'>2021-04-18</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=0cfe02cf55baf8ef1395bc8f108672159355f606'>nls: Update 'ru' translation.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-11-05 16:42:38 +0100'>2020-11-05</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=eff2cabdde1077928868d06ac197f03f114f03fe'>nls: Update translations of the manual.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-10-29 20:19:05 +0100'>2020-10-29</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=759774bc69e91c9db6f5070b75d5a5fe9b36c04b'>nls: Update 'ru' translation of the manual.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-05-05 23:45:56 +0200'>2020-05-05</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=0701274446bbd39b053a0c65947fd7f1319f7bf6'>nls: Update.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-04-12 00:18:05 +0200'>2020-04-12</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=935ef44b398353b5b6af94e185d7b0c3d833db0b'>nls: Update.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-03-23 00:06:58 +0100'>2020-03-23</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=86603d8660e42a3b5d8b407e456a98429943bc7e'>nls: Update.</a></td><td>Ludovic Courtès</td></tr>