aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-12-06 00:04:29 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-12-14 00:08:33 +0100
commitc37c47ac496ec3335845ce9575c82b1fb28a831e (patch)
tree0e753fbdd06b0c98256e9114957fcc7a0bcadc4b /nx-X11/programs
parent7610c0f19e01f2815966b1e333d65c8ab748bd1f (diff)
downloadnx-libs-c37c47ac496ec3335845ce9575c82b1fb28a831e.tar.gz
nx-libs-c37c47ac496ec3335845ce9575c82b1fb28a831e.tar.bz2
nx-libs-c37c47ac496ec3335845ce9575c82b1fb28a831e.zip
Keyboard.c: Improve TEST output
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keyboard.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 51f57a897..c4a45ceca 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -556,11 +556,17 @@ static char *nxagentXkbGetRules()
strcpy(path, XkbBaseDirectory);
strcat(path, "/rules/");
strcat(path, XKB_DFLT_RULES_FILE);
+ #ifdef TEST
+ fprintf(stderr, "nxagentXkbGetRules: checking rules file [%s]\n", path);
+ #endif
ret = stat(path, &buf);
if (ret == 0)
{
free(path);
+ #ifdef TEST
+ fprintf(stderr, "nxagentXkbGetRules: returning default rules file [%s]\n", XKB_DFLT_RULES_FILE);
+ #endif
return XKB_DFLT_RULES_FILE;
}
@@ -571,11 +577,17 @@ static char *nxagentXkbGetRules()
strcpy(path, XkbBaseDirectory);
strcat(path, "/rules/");
strcat(path, XKB_ALTS_RULES_FILE);
+ #ifdef TEST
+ fprintf(stderr, "nxagentXkbGetRules: checking rules file [%s]\n", path);
+ #endif
ret = stat(path, &buf);
if (ret == 0)
{
free(path);
+ #ifdef TEST
+ fprintf(stderr, "nxagentXkbGetRules: returning alternative rules file [%s]\n", XKB_ALTS_RULES_FILE);
+ #endif
return XKB_ALTS_RULES_FILE;
}
@@ -584,6 +596,9 @@ static char *nxagentXkbGetRules()
#endif
free(path);
+ #ifdef TEST
+ fprintf(stderr, "nxagentXkbGetRules: returning default rules file [%s]\n", XKB_DFLT_RULES_FILE);
+ #endif
return XKB_DFLT_RULES_FILE;
}
@@ -951,7 +966,7 @@ XkbError:
options = XKB_DFLT_KB_OPTIONS;
#ifdef TEST
- fprintf(stderr, "nxagentKeyboardProc: XkbInitialMap [%s]\n", XkbInitialMap ? XkbInitialMap : "NULL");
+ fprintf(stderr, "nxagentKeyboardProc: XkbInitialMap (option -xkbmap) is [%s]\n", XkbInitialMap ? XkbInitialMap : "NULL");
#endif
if (XkbInitialMap) {