diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-11-26 08:35:55 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-11-26 08:35:55 +0100 |
| commit | 7f777e01e3bb8780ba91e70171a0aae78a95692e (patch) | |
| tree | d7f160a956061a73d8636a1cf53078464ce2bf2e /nx-X11/programs/Xserver/hw/nxagent/Args.c | |
| parent | 2e724702e004abf5df1061dd799c9349edc2b099 (diff) | |
| parent | 66046f138cf816d4f0bd7ddd9faac772acb22a97 (diff) | |
| download | nx-libs-7f777e01e3bb8780ba91e70171a0aae78a95692e.tar.gz nx-libs-7f777e01e3bb8780ba91e70171a0aae78a95692e.tar.bz2 nx-libs-7f777e01e3bb8780ba91e70171a0aae78a95692e.zip | |
Merge branch 'uli42-pr/nokeyconv' into 3.6.x
Attributes GH PR #556: https://github.com/ArcticaProject/nx-libs/pull/556
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Args.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Args.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index ea970be02..cccfd40e0 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -1483,6 +1483,25 @@ static void nxagentParseOptions(char *name, char *value) return; } + else if (!strcmp(name, "keyconv")) + { + if (!strcmp(value, "off")) { + nxagentChangeOption(KeycodeConversion, KeycodeConversionOff); + } + else if (!strcmp(value, "on")) { + nxagentChangeOption(KeycodeConversion, KeycodeConversionOn); + } + else if (!strcmp(value, "auto")) { + nxagentChangeOption(KeycodeConversion, KeycodeConversionAuto); + } + else + { + fprintf(stderr, "Warning: Ignoring bad value '%s' for option 'keyconv'.\n", + validateString(value)); + } + + return; + } else { #ifdef DEBUG |