1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
--- a/nxagent/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nxagent/programs/Xserver/hw/nxagent/Keyboard.c
@@ -136,7 +136,7 @@
#define XKB_ALTERNATE_BASE_DIRECTORY "/usr/X11R6/lib/X11/xkb"
#endif
#ifndef XKB_CONFIG_FILE
-#define XKB_CONFIG_FILE "X0-config.keyboard"
+#define XKB_CONFIG_FILE "/etc/nxagent/nxagent.keyboard"
#endif
#ifndef XKB_DFLT_RULES_FILE
#define XKB_DFLT_RULES_FILE "xfree86"
@@ -978,8 +978,7 @@
XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb);
- nxagentXkbConfigFilePathSize = strlen(XkbBaseDirectory) +
- strlen(XKB_CONFIG_FILE) + 1;
+ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE);
nxagentXkbConfigFilePath = malloc((nxagentXkbConfigFilePathSize + 1) * sizeof(char));
@@ -988,9 +987,7 @@
FatalError("nxagentKeyboardProc: malloc failed.");
}
- strcpy(nxagentXkbConfigFilePath, XkbBaseDirectory);
- strcat(nxagentXkbConfigFilePath, "/");
- strcat(nxagentXkbConfigFilePath, XKB_CONFIG_FILE);
+ strcpy(nxagentXkbConfigFilePath, XKB_CONFIG_FILE);
#ifdef TEST
fprintf(stderr, "nxagentKeyboardProc: nxagentXkbConfigFilePath [%s].\n",
|
