aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-11-19 01:11:05 +0100
committerUlrich Sibiller <uli42@gmx.de>2017-11-23 15:22:27 +0100
commit8fd25cf83c057e9d865b672eb3d42e2d362eabd7 (patch)
treeaed11ec731218f67dd34195c25a379713ac251d7 /nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
parent4b71309c3e727bf1770e8150546060a450246f24 (diff)
downloadnx-libs-8fd25cf83c057e9d865b672eb3d42e2d362eabd7.tar.gz
nx-libs-8fd25cf83c057e9d865b672eb3d42e2d362eabd7.tar.bz2
nx-libs-8fd25cf83c057e9d865b672eb3d42e2d362eabd7.zip
add option keyconv=(auto|on|off)
Adds a new option called "keyconv" to control keycode conversion. Before commit 2f2ade61a8823bad012737b2b388dcc168cccbbf keycode conversion was activated if the client was Linux and client side rules and/or model was "evdev". The only (and undocumented) way to disable that was providing a value different from "linux" for the "client" option (which had no other effect). The mentioned commit removed the dependency on Linux and so there was no way anymore to disable keycode conversion.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Keyboard.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keyboard.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 06977d99d..e92df8762 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -1821,6 +1821,19 @@ void nxagentKeycodeConversionSetup(void)
char *doptions = NULL;
unsigned int drulesLen;
+ if (nxagentOption(KeycodeConversion) == KeycodeConversionOff)
+ {
+ fprintf(stderr, "Info: Keycode conversion is off\n");
+ nxagentKeycodeConversion = False;
+ return;
+ }
+ else if (nxagentOption(KeycodeConversion) == KeycodeConversionOn)
+ {
+ fprintf(stderr, "Info: Keycode conversion is on\n");
+ nxagentKeycodeConversion = True;
+ return;
+ }
+
nxagentKeycodeConversion = False;
drulesLen = nxagentXkbGetNames(&drules, &dmodel, &dlayout,
@@ -1894,8 +1907,13 @@ void nxagentKeycodeConversionSetup(void)
"Activating KeyCode conversion.\n");
#endif
+ fprintf(stderr, "Info: Keycode conversion auto-determined as on\n");
nxagentKeycodeConversion = True;
}
+ else
+ {
+ fprintf(stderr, "Info: Keycode conversion auto-determined as off\n");
+ }
if (drules != NULL)
{