From 5963852e6c57ddc59628adb13750b060537c81bd Mon Sep 17 00:00:00 2001
From: marschap <marschap@users.sourceforge.net>
Date: Sat, 29 Apr 2006 19:43:28 +0000
Subject: [PATCH] add config option DisplayName to set the client name (e.g.
 for the menus)

---
 clients/lcdproc/lcdproc.conf |  3 +++
 clients/lcdproc/main.c       | 13 +++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/clients/lcdproc/lcdproc.conf b/clients/lcdproc/lcdproc.conf
index 994ca1c..90c39a7 100644
--- a/clients/lcdproc/lcdproc.conf
+++ b/clients/lcdproc/lcdproc.conf
@@ -20,6 +20,9 @@ ReportToSyslog=false
 # slow down initial announcement of modes (in 1/100s)
 #delay=2
 
+# display name for the main menu [default: LCDproc HOST]
+#DisplayName=lcdproc
+
 
 ## screen specific configuration options ##
 
diff --git a/clients/lcdproc/main.c b/clients/lcdproc/main.c
index fdacb6e..e3963ff 100644
--- a/clients/lcdproc/main.c
+++ b/clients/lcdproc/main.c
@@ -108,6 +108,7 @@ int foreground 	= UNSET_INT;
 static int report_level = UNSET_INT;
 static int report_dest 	= UNSET_INT;
 char *configfile = NULL;
+char *displayname = NULL;
 
 
 const char *get_hostname()
@@ -322,6 +323,7 @@ static int
 process_configfile(char *configfile)
 {
 	int k;
+	char *tmp;
 
 	debug(RPT_DEBUG, "%s(%s)", __FUNCTION__, (configfile) ? configfile : "<null>");
 
@@ -349,6 +351,7 @@ process_configfile(char *configfile)
 	if (port == UNSET_INT) {
 		port = config_get_int(progname, "Port", 0, LCDPORT);
 	}
+
 	if(report_level == UNSET_INT) {
 		report_level = config_get_int(progname, "ReportLevel", 0, RPT_WARNING);
 	}
@@ -363,9 +366,12 @@ process_configfile(char *configfile)
 		foreground = config_get_bool(progname, "Foreground", 0, 0);
 	}
 	if (islow < 0) {
-		islow = config_get_int(progname, "delay", 0, -1);
+		islow = config_get_int(progname, "Delay", 0, -1);
 	}
 
+	if ((tmp = config_get_string(progname, "DisplayName", 0, NULL)) != NULL)
+		displayname = strdup(tmp);
+
 	/*
 	 * check for config file variables to override all the sequence defaults
 	 */
@@ -569,7 +575,10 @@ main_loop()
 										lcd_cellhgt = atoi(argv[++a]);
 								}
 								connected = 1;
-								sock_printf(sock, "client_set -name {LCDproc %s}\n", get_hostname());
+								if (displayname != NULL)
+									sock_printf(sock, "client_set -name \"%s\"\n", displayname);
+								else
+									sock_printf(sock, "client_set -name {LCDproc %s}\n", get_hostname());
 #ifdef LCDPROC_MENUS
 								menus_init();
 #endif