add config option DisplayName to set the client name (e.g. for the menus)
This commit is contained in:
@@ -20,6 +20,9 @@ ReportToSyslog=false
|
|||||||
# slow down initial announcement of modes (in 1/100s)
|
# slow down initial announcement of modes (in 1/100s)
|
||||||
#delay=2
|
#delay=2
|
||||||
|
|
||||||
|
# display name for the main menu [default: LCDproc HOST]
|
||||||
|
#DisplayName=lcdproc
|
||||||
|
|
||||||
|
|
||||||
## screen specific configuration options ##
|
## screen specific configuration options ##
|
||||||
|
|
||||||
|
|||||||
+10
-1
@@ -108,6 +108,7 @@ int foreground = UNSET_INT;
|
|||||||
static int report_level = UNSET_INT;
|
static int report_level = UNSET_INT;
|
||||||
static int report_dest = UNSET_INT;
|
static int report_dest = UNSET_INT;
|
||||||
char *configfile = NULL;
|
char *configfile = NULL;
|
||||||
|
char *displayname = NULL;
|
||||||
|
|
||||||
|
|
||||||
const char *get_hostname()
|
const char *get_hostname()
|
||||||
@@ -322,6 +323,7 @@ static int
|
|||||||
process_configfile(char *configfile)
|
process_configfile(char *configfile)
|
||||||
{
|
{
|
||||||
int k;
|
int k;
|
||||||
|
char *tmp;
|
||||||
|
|
||||||
debug(RPT_DEBUG, "%s(%s)", __FUNCTION__, (configfile) ? configfile : "<null>");
|
debug(RPT_DEBUG, "%s(%s)", __FUNCTION__, (configfile) ? configfile : "<null>");
|
||||||
|
|
||||||
@@ -349,6 +351,7 @@ process_configfile(char *configfile)
|
|||||||
if (port == UNSET_INT) {
|
if (port == UNSET_INT) {
|
||||||
port = config_get_int(progname, "Port", 0, LCDPORT);
|
port = config_get_int(progname, "Port", 0, LCDPORT);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(report_level == UNSET_INT) {
|
if(report_level == UNSET_INT) {
|
||||||
report_level = config_get_int(progname, "ReportLevel", 0, RPT_WARNING);
|
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);
|
foreground = config_get_bool(progname, "Foreground", 0, 0);
|
||||||
}
|
}
|
||||||
if (islow < 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
|
* check for config file variables to override all the sequence defaults
|
||||||
*/
|
*/
|
||||||
@@ -569,6 +575,9 @@ main_loop()
|
|||||||
lcd_cellhgt = atoi(argv[++a]);
|
lcd_cellhgt = atoi(argv[++a]);
|
||||||
}
|
}
|
||||||
connected = 1;
|
connected = 1;
|
||||||
|
if (displayname != NULL)
|
||||||
|
sock_printf(sock, "client_set -name \"%s\"\n", displayname);
|
||||||
|
else
|
||||||
sock_printf(sock, "client_set -name {LCDproc %s}\n", get_hostname());
|
sock_printf(sock, "client_set -name {LCDproc %s}\n", get_hostname());
|
||||||
#ifdef LCDPROC_MENUS
|
#ifdef LCDPROC_MENUS
|
||||||
menus_init();
|
menus_init();
|
||||||
|
|||||||
Reference in New Issue
Block a user