aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-03-13 21:19:48 +0100
committerUlrich Sibiller <uli42@gmx.de>2017-03-13 22:17:42 +0100
commitc134b93ac09ff520539dd73482455808c0e22a38 (patch)
treeef859fe87f5c6f3c15b061b5c33ae1f2a9d2fe9e /nx-X11/programs
parent8f2679abc6910155fa2e5ddeb54cd7cfd4dcf17f (diff)
downloadnx-libs-c134b93ac09ff520539dd73482455808c0e22a38.tar.gz
nx-libs-c134b93ac09ff520539dd73482455808c0e22a38.tar.bz2
nx-libs-c134b93ac09ff520539dd73482455808c0e22a38.zip
Keystroke.c: use an own environment variable for X2Go
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keystroke.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
index f655e3b95..ec408d3c2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
@@ -245,13 +245,15 @@ static Bool read_binding_from_xmlnode(xmlNode *node, struct nxagentSpecialKeystr
* - $HOME/.nx/config/keystrokes.cfg
* - /etc/nxagent/keystrokes.cfg
* - hardcoded traditional NX default settings
+ * If run in x2go flavour different filenames and varnames are used.
*/
static void parse_keystroke_file(void)
{
char *filename = NULL;
- char *homefile = "/.nx/config/keystrokes.cfg";
- char *etcfile = "/etc/nxagent/keystrokes.cfg";
+ char *homefile;
+ char *etcfile;
+ char *envvar;
/* used for tracking if the config file parsing has already been
done (regardless of the result) */
@@ -263,6 +265,11 @@ static void parse_keystroke_file(void)
if (nxagentX2go) {
homefile = "/.x2go/config/keystrokes.cfg";
etcfile = "/etc/x2go/keystrokes.cfg";
+ envvar = "X2GO_KEYSTROKEFILE";
+ } else {
+ homefile = "/.nx/config/keystrokes.cfg";
+ etcfile = "/etc/nxagent/keystrokes.cfg";
+ envvar = "NXAGENT_KEYSTROKEFILE";
}
if (nxagentKeystrokeFile != NULL && access(nxagentKeystrokeFile, R_OK) == 0)
@@ -274,7 +281,7 @@ static void parse_keystroke_file(void)
exit(EXIT_FAILURE);
}
}
- else if ((filename = getenv("NXAGENT_KEYSTROKEFILE")) != NULL && access(filename, R_OK) == 0)
+ else if ((filename = getenv(envvar)) != NULL && access(filename, R_OK) == 0)
{
filename = strdup(filename);
if (filename == NULL)